diff --git a/etc.hosts b/etc.hosts index 5151343..c06aebb 100644 --- a/etc.hosts +++ b/etc.hosts @@ -82,8 +82,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 2a09:80c0:102::2 6.nardole.i 95.217.192.59 neoprism.i 95.217.192.59 4.neoprism.i -2a01:4f9:4a:4f1a::1 neoprism.i -2a01:4f9:4a:4f1a::1 6.neoprism.i +2a01:4f9:4a:4f1a::2 neoprism.i +2a01:4f9:4a:4f1a::2 6.neoprism.i 185.162.251.237 ni.i cgit.ni.i 185.162.251.237 4.ni.i 4.cgit.ni.i 2a03:4000:1a:cf::1 ni.i cgit.ni.i @@ -122,8 +122,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 131.159.102.7 4.yasmin.i 2a09:80c0:102::7 yasmin.i 2a09:80c0:102::7 6.yasmin.i -42:0:3097:d913:5908:197e:e50b:f11b Ra33it0.Ra33it0.r -42:0:3097:d913:5908:197e:e50b:f11b 6.Ra33it0.Ra33it0.r 42:0:3c46:b79b:e658:22f8:3a00:fc74 adelaide.r 42:0:3c46:b79b:e658:22f8:3a00:fc74 6.adelaide.r 10.243.29.172 aendernix.r @@ -602,6 +600,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:4a6f::4266 6.thecostraca.crustacea.r 10.243.117.12 toastbrot.r 10.243.117.12 4.toastbrot.r +10.243.43.12 tofu.dbalan.r +10.243.43.12 4.tofu.dbalan.r +42:0:3c46:3ce:cc52:e9ce:b39e:abd8 tofu.dbalan.r +42:0:3c46:3ce:cc52:e9ce:b39e:abd8 6.tofu.dbalan.r 10.243.183.236 tpsw.r 10.243.183.236 4.tpsw.r 42:0:3c46:7eec:653c:73c1:91dc:f89e tpsw.r @@ -620,6 +622,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.0.12 4.ubik.r 42:0:ce16::b1c ubik.r 42:0:ce16::b1c 6.ubik.r +42:0:3097:d913:5908:197e:e50b:f11b unispore.Ra33it0.r +42:0:3097:d913:5908:197e:e50b:f11b 6.unispore.Ra33it0.r 10.243.3.14 unnamed.r 10.243.3.14 4.unnamed.r 42:0:3c46:20f:e882:bcaa:db1e:2e2 unnamed.r @@ -672,6 +676,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.2.34 4.zaatar.r 4.zaatar.kmein.r 4.grocy.kmein.r 4.moodle.kmein.r 4.radio.kmein.r 4.home.kmein.r 42:0:3c46:156e:10b6:3bd6:6e82:b2cd zaatar.r zaatar.kmein.r grocy.kmein.r moodle.kmein.r radio.kmein.r home.kmein.r 42:0:3c46:156e:10b6:3bd6:6e82:b2cd 6.zaatar.r 6.zaatar.kmein.r 6.grocy.kmein.r 6.moodle.kmein.r 6.radio.kmein.r 6.home.kmein.r +10.243.13.43 zoppo.r +10.243.13.43 4.zoppo.r +42:0:a46e:205f:cc6b:6433:55d4:574b zoppo.r +42:0:a46e:205f:cc6b:6433:55d4:574b 6.zoppo.r 10.243.13.40 zu.r 10.243.13.40 4.zu.r 42:0:a46e:9c86:82ce:fa82:83d3:fda zu.r @@ -798,5 +806,7 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:a46e:c3c:9c2f:1386:90fc:a489 6.xu.w 42:1:ce16::3110 yellow.w 42:1:ce16::3110 6.yellow.w +42:1:a46e:205f:cc6b:6433:55d4:574b zoppo.w +42:1:a46e:205f:cc6b:6433:55d4:574b 6.zoppo.w 42:1:a46e:9c86:82ce:fa82:83d3:fda zu.w 42:1:a46e:9c86:82ce:fa82:83d3:fda 6.zu.w diff --git a/etc.hosts-v6only b/etc.hosts-v6only index 8b5dc51..4162a53 100644 --- a/etc.hosts-v6only +++ b/etc.hosts-v6only @@ -82,8 +82,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 2a09:80c0:102::2 6.nardole.i 95.217.192.59 neoprism.i 95.217.192.59 4.neoprism.i -2a01:4f9:4a:4f1a::1 neoprism.i -2a01:4f9:4a:4f1a::1 6.neoprism.i +2a01:4f9:4a:4f1a::2 neoprism.i +2a01:4f9:4a:4f1a::2 6.neoprism.i 185.162.251.237 ni.i cgit.ni.i 185.162.251.237 4.ni.i 4.cgit.ni.i 2a03:4000:1a:cf::1 ni.i cgit.ni.i @@ -122,8 +122,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 131.159.102.7 4.yasmin.i 2a09:80c0:102::7 yasmin.i 2a09:80c0:102::7 6.yasmin.i -42:0:3097:d913:5908:197e:e50b:f11b Ra33it0.Ra33it0.r -42:0:3097:d913:5908:197e:e50b:f11b 6.Ra33it0.Ra33it0.r 42:0:3c46:b79b:e658:22f8:3a00:fc74 adelaide.r 42:0:3c46:b79b:e658:22f8:3a00:fc74 6.adelaide.r 42:0:3c46:f14:26a0:7b5e:349f:7f0b aendernix.r @@ -394,6 +392,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:4a6f::4265 6.tantulocarida.crustacea.r 42:0:4a6f::4266 thecostraca.crustacea.r 42:0:4a6f::4266 6.thecostraca.crustacea.r +42:0:3c46:3ce:cc52:e9ce:b39e:abd8 tofu.dbalan.r +42:0:3c46:3ce:cc52:e9ce:b39e:abd8 6.tofu.dbalan.r 42:0:3c46:7eec:653c:73c1:91dc:f89e tpsw.r 42:0:3c46:7eec:653c:73c1:91dc:f89e 6.tpsw.r 42:0:e644:2215:73ba:f838:855e:945b tsp.r @@ -404,6 +404,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:47e8:f610:15d1:27a3:674b 6.turingmachine.r 42:0:ce16::b1c ubik.r 42:0:ce16::b1c 6.ubik.r +42:0:3097:d913:5908:197e:e50b:f11b unispore.Ra33it0.r +42:0:3097:d913:5908:197e:e50b:f11b 6.unispore.Ra33it0.r 42:0:3c46:20f:e882:bcaa:db1e:2e2 unnamed.r 42:0:3c46:20f:e882:bcaa:db1e:2e2 6.unnamed.r 42:0:3c46:bc8c:78fb:66b5:512c:7fbe ilmu.r @@ -434,6 +436,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:ce16::3110 6.yellow.r 6.jelly.r 6.flix.r 6.radar.r 6.sonar.r 6.transmission.r 42:0:3c46:156e:10b6:3bd6:6e82:b2cd zaatar.r zaatar.kmein.r grocy.kmein.r moodle.kmein.r radio.kmein.r home.kmein.r 42:0:3c46:156e:10b6:3bd6:6e82:b2cd 6.zaatar.r 6.zaatar.kmein.r 6.grocy.kmein.r 6.moodle.kmein.r 6.radio.kmein.r 6.home.kmein.r +42:0:a46e:205f:cc6b:6433:55d4:574b zoppo.r +42:0:a46e:205f:cc6b:6433:55d4:574b 6.zoppo.r 42:0:a46e:9c86:82ce:fa82:83d3:fda zu.r 42:0:a46e:9c86:82ce:fa82:83d3:fda 6.zu.r 42:1:3c46:eac1:fdee:430d:40bd:57de ada.w @@ -524,5 +528,7 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:a46e:c3c:9c2f:1386:90fc:a489 6.xu.w 42:1:ce16::3110 yellow.w 42:1:ce16::3110 6.yellow.w +42:1:a46e:205f:cc6b:6433:55d4:574b zoppo.w +42:1:a46e:205f:cc6b:6433:55d4:574b 6.zoppo.w 42:1:a46e:9c86:82ce:fa82:83d3:fda zu.w 42:1:a46e:9c86:82ce:fa82:83d3:fda 6.zu.w diff --git a/hosts/tofu b/hosts/tofu new file mode 100644 index 0000000..f2384fd --- /dev/null +++ b/hosts/tofu @@ -0,0 +1,20 @@ +Subnet = 10.243.43.12 +Subnet = 42:0:3c46:3ce:cc52:e9ce:b39e:abd8 + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAlBMwSkdI+3CWPVazfDoPCoqYJH1MLd8Z/ZQCTFx4MhLO/DvJrb7H +HJEwvFuImk2yy4oYfcRz8pK+ymBDArdVT5aeTwztTbjkcWa5RTm2d2xuYppTUPZB +L0/yY+a+mP1eRa8O6HAoNx3ETvC5euJS40qISTh6grPGFV7i1HhGNPUkvYFlNF6q +rJs7RgC8Y2/OSNed5WdJfNYNBeB4xUiKtg3sShKQGO++860yNV4G+J+PtBVnMs8/ +MnxQbJxnMbhAHNQt5nV+Z66Ewy/2qcn4clrGB3SG1v9fFizzh9mAFK3Udfa+6s8r +JaM4BL41uOgHxiiKovmudxIRtts31cKzwPkMyThQpK8hdxJxrCzSQSbiDUkckE+5 +CeLgAh5jMwEkT6OvYOGZbyeqvZX5gX+yErJyRlsjgYs5TTlfUnpg1BKz2BErzb1b ++lWsZXjO03BpNXsuWhC2sspKfuB3+fjlNwR+ov8/UDTOwhzBz15TlufcxiqzA08d +yJiNylm07C19qxlffqSZ5KSZGTT+DZg53ror1PLMoxLApV5MgHiM6oltDxemSegb +yySGz/EFDDbQQYLYOPu6seLt+ktudvFTERmetV0Bn37Ok8Avs2y6BIgXWjVxcb5p +EDbE5tAvX/MZIU9rAXRqDAOulumfvsyFpK8RkXDEoIQEt+gDoZ5OzJsCAwEAAQ== +-----END RSA PUBLIC KEY----- + +Ed25519PublicKey = b355fDYFQgFFj3KfzUCv4DPSfoFTKklsB12imwci7fH + +Weight = 300 \ No newline at end of file diff --git a/hosts/DUMMYHOST b/hosts/unispore similarity index 91% rename from hosts/DUMMYHOST rename to hosts/unispore index f1dd3c2..cf320c9 100644 --- a/hosts/DUMMYHOST +++ b/hosts/unispore @@ -1,6 +1,6 @@ Subnet = 42:0:3097:d913:5908:197e:e50b:f11b - -----BEGIN RSA PUBLIC KEY----- +-----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA6Cb+b+snYpsQv1J0yMPSL4P0iKs2EkDtqtt6kBOvqFTr2lRB2thp mu9fRbz/CFmcvFXoEMWQEEkKcyhgJEola2+7Ra49iMNX55o/I0iZ499ZI5rIK/JG +A60ijPCh5TSGYIMiD7VWRsxoAtzB1DZ6n4z94KN0wQB5dXKuLPjk/TDfJPuzMrS @@ -12,7 +12,7 @@ CWYM/HzSffzztK8bF0DwhdWzjtNcwZ05XfA2krGZyMj9UxpwN84o1syCnnYC1Xzg 4r48fUhubXXE4SbdnN68pCNCct9DT8exPeYeJL2FHi6s+EsfBY+NGEAaQGJTeQEW zUSnX/txoZV6xGUKZ4iOgfQ4MBCVVdtPAaurNP/esVwOr0WF0DTuBDPGBaOqo+Us Ef5cREwrCE8nEY8tu3xl4M9iuCTwBuT79YFhfNI3jr1lcg6f8wGaTYsCAwEAAQ== - -----END RSA PUBLIC KEY----- +-----END RSA PUBLIC KEY----- Ed25519PublicKey = cFCAfLbDYv/Ty3m34aHgHr1dXGp2DSwfP0K7GG1TA7D diff --git a/hosts/zoppo b/hosts/zoppo new file mode 100644 index 0000000..76b69e6 --- /dev/null +++ b/hosts/zoppo @@ -0,0 +1,15 @@ +Subnet = 10.243.13.43 +Subnet = 42:0:a46e:205f:cc6b:6433:55d4:574b + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAtMzW+RL4mik0JHLL2p21bWy81bVv84mi/NKHyewXxx9EahD3cyOP +D/2gLipJnzyjxvM7HzR0FQpBCD5VLmRk2MrRENUGYzrNFhSu36gVg5bGngr0pZld +Fosd5wemGx6SUoXMzuBT/st0sg1Azg5mtA1joQTr47NlcwfFrUe7YT8i67szxJSO +Qo6BP+Zl6uVr9m8zSVwrj7TAoC7DQLhCTb3QJdpyYibHwpo0bMyyJjeuL/NpnOpH +Bv1pZ0oXr/nzCo+8jyQY4L2NonJnHtlzYOQf1cHJ+v+P1jOgGgBGqjo0LOE29Tvx +cfQYGLLZc4mRjVQJF3NYW6kHFqKmuu/y5QIDAQAB +-----END RSA PUBLIC KEY----- + +Ed25519PublicKey = nVIMNp7r21MYneV24x6qVesCjQYM/pvF6nzaihH7GfD + +Weight = 300 \ No newline at end of file diff --git a/wiregrill.json b/wiregrill.json index 32c349a..809ac0f 100644 --- a/wiregrill.json +++ b/wiregrill.json @@ -286,6 +286,12 @@ ], "publicKey": "YeWbR3mW+nOVBE7bcNSzF5fjj9ppd8OGHBJqERAUVxU=" }, + "zoppo": { + "allowedIPs": [ + "42:1:a46e:205f:cc6b:6433:55d4:574b" + ], + "publicKey": "5YFGAb9Tg/5HH+XHSKanh4P6jE7KTrViwqVuEkmQeSg=" + }, "zu": { "allowedIPs": [ "42:1:a46e:9c86:82ce:fa82:83d3:fda"