diff --git a/etc.hosts b/etc.hosts index b7f3926..27bce61 100644 --- a/etc.hosts +++ b/etc.hosts @@ -468,10 +468,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.29.190 4.okelmann.r 42:0:3c46:2626:717f:6671:a6f8:d89d okelmann.r 42:0:3c46:2626:717f:6671:a6f8:d89d 6.okelmann.r -10.243.0.89 omo.r dcpp.omo.r backup.makefu.r torrent.omo.r music.omo.r music.makefu.r -10.243.0.89 4.omo.r 4.dcpp.omo.r 4.backup.makefu.r 4.torrent.omo.r 4.music.omo.r 4.music.makefu.r -42:0:e644:920e:23f6:353a:c09:5a66 omo.r dcpp.omo.r backup.makefu.r torrent.omo.r music.omo.r music.makefu.r -42:0:e644:920e:23f6:353a:c09:5a66 6.omo.r 6.dcpp.omo.r 6.backup.makefu.r 6.torrent.omo.r 6.music.omo.r 6.music.makefu.r +10.243.0.89 omo.r dcpp.omo.r hass.omo.r backup.makefu.r torrent.omo.r music.omo.r music.makefu.r +10.243.0.89 4.omo.r 4.dcpp.omo.r 4.hass.omo.r 4.backup.makefu.r 4.torrent.omo.r 4.music.omo.r 4.music.makefu.r +42:0:e644:920e:23f6:353a:c09:5a66 omo.r dcpp.omo.r hass.omo.r backup.makefu.r torrent.omo.r music.omo.r music.makefu.r +42:0:e644:920e:23f6:353a:c09:5a66 6.omo.r 6.dcpp.omo.r 6.hass.omo.r 6.backup.makefu.r 6.torrent.omo.r 6.music.omo.r 6.music.makefu.r 10.243.0.101 onebutton.r 10.243.0.101 4.onebutton.r 42:0:ca48:bfa7:deac:9452:799:37a onebutton.r @@ -540,6 +540,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.20.18 4.spinner.rtunreal.r 42:0:3c46:7109:4c9a:3c86:73e0:a786 spinner.rtunreal.r 42:0:3c46:7109:4c9a:3c86:73e0:a786 6.spinner.rtunreal.r +10.243.20.24 worker.rtunreal.r +10.243.20.24 4.worker.rtunreal.r +42:0:3c46:984c:8136:5e94:e2a0:f6e2 worker.rtunreal.r +42:0:3c46:984c:8136:5e94:e2a0:f6e2 6.worker.rtunreal.r 10.243.13.42 ru.r 10.243.13.42 4.ru.r 42:0:a46e:1270:ed5a:d332:c106:437 ru.r @@ -548,6 +552,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:bb6d:b913:8194:ffe9:e7c8 6.ruby.r 42:0:3c46:53a7:e0e3:a2b6:471d:44a ryan.r 42:0:3c46:53a7:e0e3:a2b6:471d:44a 6.ryan.r +10.243.136.238 sava.r +10.243.136.238 4.sava.r +42:0:e644:4a2f:1f93:4696:f1d9:ca sava.r +42:0:e644:4a2f:1f93:4696:f1d9:ca 6.sava.r 42:0:2ef9:4913:20d:9d9f:229:fdd9 schlepptop.berber.r 42:0:2ef9:4913:20d:9d9f:229:fdd9 6.schlepptop.berber.r 10.243.83.237 sdev.r @@ -728,6 +736,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:ce16::1205 6.icarus.w 42:1:ce16::189 lasspi.w 42:1:ce16::189 6.lasspi.w +10.244.3.43 leg.w +10.244.3.43 4.leg.w 42:1:a46e:c29a:c7c8:fc91:abb8:ed76 leg.w 42:1:a46e:c29a:c7c8:fc91:abb8:ed76 6.leg.w 42:1:ce16::771e littleT.w @@ -754,6 +764,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:e644:920e:23f6:353a:c09:5a66 6.omo.w 6.hass.omo.w 6.jelly.omo.w 6.jelly.makefu.w 42:1:ce16::12a orange.w 42:1:ce16::12a 6.orange.w +10.244.3.103 pa.w +10.244.3.103 4.pa.w +42:1:a46e:3d82:9513:229d:4359:7826 pa.w +42:1:a46e:3d82:9513:229d:4359:7826 6.pa.w 10.244.1.13 phone.w 10.244.1.13 4.phone.w 42:1:ce16::a phone.w @@ -780,6 +794,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:3c46:bb9d:87b8:4272:ab04:a670 6.graphene.rtunreal.w 42:1:a46e:1270:ed5a:d332:c106:437 ru.w 42:1:a46e:1270:ed5a:d332:c106:437 6.ru.w +42:1:e644:4a2f:1f93:4696:f1d9:ca savarcast.w +42:1:e644:4a2f:1f93:4696:f1d9:ca 6.savarcast.w 10.244.245.2 shackdev.w 10.244.245.2 4.shackdev.w 42:1:e644:e626:6023:4892:d72a:8e19 shackdev.w diff --git a/etc.hosts-v6only b/etc.hosts-v6only index 7a19ca8..f3fcc31 100644 --- a/etc.hosts-v6only +++ b/etc.hosts-v6only @@ -318,8 +318,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:c04f:5f98:f4b1:7dca:11b4 6.nxrm.r 42:0:3c46:2626:717f:6671:a6f8:d89d okelmann.r 42:0:3c46:2626:717f:6671:a6f8:d89d 6.okelmann.r -42:0:e644:920e:23f6:353a:c09:5a66 omo.r dcpp.omo.r backup.makefu.r torrent.omo.r music.omo.r music.makefu.r -42:0:e644:920e:23f6:353a:c09:5a66 6.omo.r 6.dcpp.omo.r 6.backup.makefu.r 6.torrent.omo.r 6.music.omo.r 6.music.makefu.r +42:0:e644:920e:23f6:353a:c09:5a66 omo.r dcpp.omo.r hass.omo.r backup.makefu.r torrent.omo.r music.omo.r music.makefu.r +42:0:e644:920e:23f6:353a:c09:5a66 6.omo.r 6.dcpp.omo.r 6.hass.omo.r 6.backup.makefu.r 6.torrent.omo.r 6.music.omo.r 6.music.makefu.r 42:0:ca48:bfa7:deac:9452:799:37a onebutton.r 42:0:ca48:bfa7:deac:9452:799:37a 6.onebutton.r 42:0:ce16::12a orange.r cgit.orange.r @@ -358,12 +358,16 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:d00e:e9e8:5fc8:987d:252f 6.runner.rtunreal.r 42:0:3c46:7109:4c9a:3c86:73e0:a786 spinner.rtunreal.r 42:0:3c46:7109:4c9a:3c86:73e0:a786 6.spinner.rtunreal.r +42:0:3c46:984c:8136:5e94:e2a0:f6e2 worker.rtunreal.r +42:0:3c46:984c:8136:5e94:e2a0:f6e2 6.worker.rtunreal.r 42:0:a46e:1270:ed5a:d332:c106:437 ru.r 42:0:a46e:1270:ed5a:d332:c106:437 6.ru.r 42:0:3c46:bb6d:b913:8194:ffe9:e7c8 ruby.r 42:0:3c46:bb6d:b913:8194:ffe9:e7c8 6.ruby.r 42:0:3c46:53a7:e0e3:a2b6:471d:44a ryan.r 42:0:3c46:53a7:e0e3:a2b6:471d:44a 6.ryan.r +42:0:e644:4a2f:1f93:4696:f1d9:ca sava.r +42:0:e644:4a2f:1f93:4696:f1d9:ca 6.sava.r 42:0:2ef9:4913:20d:9d9f:229:fdd9 schlepptop.berber.r 42:0:2ef9:4913:20d:9d9f:229:fdd9 6.schlepptop.berber.r 42:0:e644:24ad:995f:5926:71d5:b26e sdev.r @@ -494,6 +498,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:e644:920e:23f6:353a:c09:5a66 6.omo.w 6.hass.omo.w 6.jelly.omo.w 6.jelly.makefu.w 42:1:ce16::12a orange.w 42:1:ce16::12a 6.orange.w +42:1:a46e:3d82:9513:229d:4359:7826 pa.w +42:1:a46e:3d82:9513:229d:4359:7826 6.pa.w 42:1:ce16::a phone.w 42:1:ce16::a 6.phone.w 42:1:a46e:1eb7:85b4:2e17:287:7c85 pi.w @@ -510,6 +516,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:3c46:bb9d:87b8:4272:ab04:a670 6.graphene.rtunreal.w 42:1:a46e:1270:ed5a:d332:c106:437 ru.w 42:1:a46e:1270:ed5a:d332:c106:437 6.ru.w +42:1:e644:4a2f:1f93:4696:f1d9:ca savarcast.w +42:1:e644:4a2f:1f93:4696:f1d9:ca 6.savarcast.w 42:1:e644:e626:6023:4892:d72a:8e19 shackdev.w 42:1:e644:e626:6023:4892:d72a:8e19 6.shackdev.w 42:1:ce16::50da shodan.w diff --git a/hosts/rtworker b/hosts/rtworker new file mode 100644 index 0000000..fe7a2ba --- /dev/null +++ b/hosts/rtworker @@ -0,0 +1,20 @@ +Subnet = 10.243.20.24 +Subnet = 42:0:3c46:984c:8136:5e94:e2a0:f6e2 + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAs6abzbB+Jljux8ivE8gtuYpTxP3FDcXQ+p8DKwadwXyDwehfyKpJ +nMMOBPnFzUgrN9zTx7Y1unvzjyxDUoyCBrDv6VLG+cS1wDQJTkovVjqWgZAWEg66 +UteNIxZoTqkQan8UD1Hb2rStpI+1C/fgqc4Kc0KX10sBp9qpsUBWwXqsXGsGOWEm +zLqjM5o0HnK9s4vKHatxvxe1yNoFiivsYDiiStnx0jXHuWcsDcazJeTYLJAdS9mC +nMfvpp6QTlDiGxxYzQrImo+KZ5aD3ugtvChK0UyIwdD1FDjgHm/NsZ1spheBhCNA +ddmS5s5xhwh86wMnbOIdrPYJweGyw4jLX6C3nqO/WJegJsfRFPKcBc0oR2lZ3pk+ +JkcvdbxiqRBEuDjttkGia4TbJ8jFHDfGDAmuIMa0Oa0GmuF+DD3Fm6GTXsKTS2jZ +sAL3b5wH1iOWCKYQhZmHlqw9DiaywsNKeH+/YtAAArH0Mle1yDP0QwSHvI3xlg5H +6igmHcK70j0ZYQKQHm5Y6FboUTZUsXkIQFdMOdHUW2KeFVQOHDpnH/dXYW97Z0fU +e4/SOdveJmF1QOygwhdddcumblBJIk0ljMkIA1fo8D4viCo6Vu0wwZbzAXhZlYkr +dXVy/bhx6xNjFMsNvmsdGx7NEulyukrApLy3JmVYZEYvcKd5lMmvxksCAwEAAQ== +-----END RSA PUBLIC KEY----- + +Ed25519PublicKey = cm3VTJMq+Z9JDaIAZhgNjs5nYOHzM8m4gglX4YCFfnF + +Weight = 300 \ No newline at end of file diff --git a/hosts/savarcast b/hosts/savarcast new file mode 100644 index 0000000..8c68bfe --- /dev/null +++ b/hosts/savarcast @@ -0,0 +1,16 @@ +Subnet = 10.243.136.238 +Subnet = 42:0:e644:4a2f:1f93:4696:f1d9:ca + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvxhCwL7g+p3rp2aelJHKHowLLcDZVqZnsuViW5jzQ5kQuDB6Rc7f +IiUXXzg6/BL2o7jUW1gRrHbiVy7360HxsTwQvV8j0/s+UsCQCybWclGE2NlsjCUM +xi/zTn/R523o43J4t6L7ohDlJVBCPMVJu5ZWVIlMAWSHI45WFu9JAyKOZJnPEYQb +eyw8P93ztZyijoRTV1SEYK9FiSsfmNgGIqPlE6QPE1S+oR6j+718WSrmQjcBO8uO +cbj4ZPEgokYRF+WH4m9fPfkTWH6qQ1idqiWZfeUR2TfLLDQ+zDpJpoXlXk/JOqMu +7kdx3dfuiulI93pUDVeGXh0YCyTmVvavdQIDAQAB +-----END RSA PUBLIC KEY----- + +Ed25519PublicKey = Ed25519PublicKey = s/m2cdP6VguKTzTFLdoHMG7t4+94NNT/+ZHYcmSxSVP + + +Weight = 300 \ No newline at end of file diff --git a/wiregrill.json b/wiregrill.json index 80652c9..fbe9272 100644 --- a/wiregrill.json +++ b/wiregrill.json @@ -97,6 +97,7 @@ }, "leg": { "allowedIPs": [ + "10.244.3.43", "42:1:a46e:c29a:c7c8:fc91:abb8:ed76" ], "publicKey": "tlGh9gpV09TspLVV/9+Z5T5fhMAQcz5c5L3KNvR/d1I=" @@ -165,6 +166,13 @@ ], "publicKey": "NP8zM9+ocwsHhY9Rn6tFqIU1FR8JidqtDs7IKpl3yU8=" }, + "pa": { + "allowedIPs": [ + "10.244.3.103", + "42:1:a46e:3d82:9513:229d:4359:7826" + ], + "publicKey": "X+Sm5uyeI1B6cVeyxPz0YXy6L5jrs2GKwfjfPuF67GA=" + }, "phone": { "allowedIPs": [ "10.244.1.13", @@ -220,6 +228,12 @@ ], "publicKey": "+3GdhwFYmBr46bBwyqrY3UH9fU1b8c2Vqmx9JTY4syU=" }, + "savarcast": { + "allowedIPs": [ + "42:1:e644:4a2f:1f93:4696:f1d9:ca" + ], + "publicKey": "mM/QKHTnLlC5qyClRY9WZKg3TK4F+WpLIKRtjCmCCHM=" + }, "shackdev": { "allowedIPs": [ "10.244.245.2", @@ -258,7 +272,7 @@ "10.244.245.4", "42:1:e644:afb2:95c8:f993:8906:3132" ], - "publicKey": "T7Cr80dBbtPFCPdz4OS7whDlQJzn2Orclq5rLVtD+Ds=" + "publicKey": "yAKvxTvcEVdn+MeKsmptZkR3XSEue+wSyLxwcjBYxxo=" }, "ubik": { "allowedIPs": [