diff --git a/etc.hosts b/etc.hosts index 34fe86f..5027c50 100644 --- a/etc.hosts +++ b/etc.hosts @@ -2,10 +2,6 @@ 131.159.102.13 4.adelaide.i 2a09:80c0:102::13 adelaide.i 2a09:80c0:102::13 6.adelaide.i -129.215.165.57 amy.i -129.215.165.57 4.amy.i -2001:630:3c1:164:b62e:99ff:fe3e:d369 amy.i -2001:630:3c1:164:b62e:99ff:fe3e:d369 6.amy.i 131.159.102.11 astrid.i 131.159.102.11 4.astrid.i 2a09:80c0:102::11 astrid.i @@ -18,20 +14,12 @@ 131.159.102.14 4.christina.i 2a09:80c0:102::14 christina.i 2a09:80c0:102::14 6.christina.i -129.215.165.58 clara.i -129.215.165.58 4.clara.i -2001:630:3c1:164:b62e:99ff:fe3d:70f2 clara.i -2001:630:3c1:164:b62e:99ff:fe3d:70f2 6.clara.i 131.159.102.12 dan.i 131.159.102.12 4.dan.i 2a09:80c0:102::12 dan.i 2a09:80c0:102::12 6.dan.i 157.90.232.92 dishfire.i 157.90.232.92 4.dishfire.i -129.215.165.54 donna.i -129.215.165.54 4.donna.i -2001:630:3c1:164:30a2:6e7b:c58b:cafd donna.i -2001:630:3c1:164:30a2:6e7b:c58b:cafd 6.donna.i 88.198.164.182 enklave.i 88.198.164.182 4.enklave.i 131.159.102.4 eva.i @@ -86,10 +74,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 131.159.102.16 4.river.i 2a09:80c0:102::16 river.i 2a09:80c0:102::16 6.river.i -129.215.165.52 rose.i -129.215.165.52 4.rose.i -2001:630:3c1:164:6d4:c4ff:fe04:4e4b rose.i -2001:630:3c1:164:6d4:c4ff:fe04:4e4b 6.rose.i 131.159.102.8 ryan.i 131.159.102.8 4.ryan.i 2a09:80c0:102::8 ryan.i @@ -128,10 +112,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.21.1 4.alnus.r 42:0:a46e:99a9:9166:ae88:208:9645 alnus.r 42:0:a46e:99a9:9166:ae88:208:9645 6.alnus.r -10.243.29.181 amy.r -10.243.29.181 4.amy.r -42:0:3c46:1551:1906:bc7c:801f:3c4 amy.r -42:0:3c46:1551:1906:bc7c:801f:3c4 6.amy.r 10.243.77.67 arcadeomat.r 10.243.77.67 4.arcadeomat.r 42:0:ca48:d189:eb99:d89:6d3a:354d arcadeomat.r @@ -172,10 +152,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:872f:60bd:5179:38b3:cba9 6.catalonia.r 42:0:3c46:9a2d:93c6:b09e:fc2:92a9 christina.r 42:0:3c46:9a2d:93c6:b09e:fc2:92a9 6.christina.r -10.243.29.182 clara.r -10.243.29.182 4.clara.r -42:0:3c46:e4e9:7814:459b:3f23:f455 clara.r -42:0:3c46:e4e9:7814:459b:3f23:f455 6.clara.r 10.243.0.17 coaxmetal.r 10.243.0.17 4.coaxmetal.r 42:0:ce16::17 coaxmetal.r @@ -208,14 +184,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.133.99 4.dishfire.r 4.grafana.lass.r 4.prometheus.lass.r 4.alert.lass.r 42:0:ce16::d15f:1233 dishfire.r grafana.lass.r prometheus.lass.r alert.lass.r 42:0:ce16::d15f:1233 6.dishfire.r 6.grafana.lass.r 6.prometheus.lass.r 6.alert.lass.r -10.243.29.186 doctor.r -10.243.29.186 4.doctor.r -42:0:3c46:96e2:72f4:be89:d6eb:ab14 doctor.r -42:0:3c46:96e2:72f4:be89:d6eb:ab14 6.doctor.r -10.243.29.180 donna.r -10.243.29.180 4.donna.r -42:0:3c46:7f2f:ed62:c6fd:9f1b:9900 donna.r -42:0:3c46:7f2f:ed62:c6fd:9f1b:9900 6.donna.r 10.243.0.3 echelon.r 10.243.0.3 4.echelon.r 42:0:ce16::4 echelon.r @@ -468,10 +436,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.23.42 4.rojava.r 42:0:3c46:f99d:fde8:a301:1b09:caf4 rojava.r 42:0:3c46:f99d:fde8:a301:1b09:caf4 6.rojava.r -10.243.29.178 rose.r -10.243.29.178 4.rose.r -42:0:3c46:a5a1:618d:663a:f0f1:ec88 rose.r -42:0:3c46:a5a1:618d:663a:f0f1:ec88 6.rose.r 10.243.122.122 rtjure.r 10.243.122.122 4.rtjure.r 42:0:3c46:e3ce:cacc:bd95:dc9f:bc85 rtjure.r diff --git a/etc.hosts-v6only b/etc.hosts-v6only index e8ce087..098d964 100644 --- a/etc.hosts-v6only +++ b/etc.hosts-v6only @@ -2,10 +2,6 @@ 131.159.102.13 4.adelaide.i 2a09:80c0:102::13 adelaide.i 2a09:80c0:102::13 6.adelaide.i -129.215.165.57 amy.i -129.215.165.57 4.amy.i -2001:630:3c1:164:b62e:99ff:fe3e:d369 amy.i -2001:630:3c1:164:b62e:99ff:fe3e:d369 6.amy.i 131.159.102.11 astrid.i 131.159.102.11 4.astrid.i 2a09:80c0:102::11 astrid.i @@ -18,20 +14,12 @@ 131.159.102.14 4.christina.i 2a09:80c0:102::14 christina.i 2a09:80c0:102::14 6.christina.i -129.215.165.58 clara.i -129.215.165.58 4.clara.i -2001:630:3c1:164:b62e:99ff:fe3d:70f2 clara.i -2001:630:3c1:164:b62e:99ff:fe3d:70f2 6.clara.i 131.159.102.12 dan.i 131.159.102.12 4.dan.i 2a09:80c0:102::12 dan.i 2a09:80c0:102::12 6.dan.i 157.90.232.92 dishfire.i 157.90.232.92 4.dishfire.i -129.215.165.54 donna.i -129.215.165.54 4.donna.i -2001:630:3c1:164:30a2:6e7b:c58b:cafd donna.i -2001:630:3c1:164:30a2:6e7b:c58b:cafd 6.donna.i 88.198.164.182 enklave.i 88.198.164.182 4.enklave.i 131.159.102.4 eva.i @@ -86,10 +74,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 131.159.102.16 4.river.i 2a09:80c0:102::16 river.i 2a09:80c0:102::16 6.river.i -129.215.165.52 rose.i -129.215.165.52 4.rose.i -2001:630:3c1:164:6d4:c4ff:fe04:4e4b rose.i -2001:630:3c1:164:6d4:c4ff:fe04:4e4b 6.rose.i 131.159.102.8 ryan.i 131.159.102.8 4.ryan.i 2a09:80c0:102::8 ryan.i @@ -118,8 +102,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:2868:6ad:5cdf:209a:943e 6.aland.r 42:0:a46e:99a9:9166:ae88:208:9645 alnus.r 42:0:a46e:99a9:9166:ae88:208:9645 6.alnus.r -42:0:3c46:1551:1906:bc7c:801f:3c4 amy.r -42:0:3c46:1551:1906:bc7c:801f:3c4 6.amy.r 42:0:ca48:d189:eb99:d89:6d3a:354d arcadeomat.r 42:0:ca48:d189:eb99:d89:6d3a:354d 6.arcadeomat.r 42:0:3c46:98ac:9c80:4f25:50e3:1d8f astrid.r @@ -144,8 +126,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:872f:60bd:5179:38b3:cba9 6.catalonia.r 42:0:3c46:9a2d:93c6:b09e:fc2:92a9 christina.r 42:0:3c46:9a2d:93c6:b09e:fc2:92a9 6.christina.r -42:0:3c46:e4e9:7814:459b:3f23:f455 clara.r -42:0:3c46:e4e9:7814:459b:3f23:f455 6.clara.r 42:0:ce16::17 coaxmetal.r 42:0:ce16::17 6.coaxmetal.r 42:0:e644:b386:6e2a:c94f:34d6:b0ca crapi.r @@ -164,10 +144,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:3c7f:bc35:f39a:8d7c:1ab4 6.dimitriosxps.r 42:0:ce16::d15f:1233 dishfire.r grafana.lass.r prometheus.lass.r alert.lass.r 42:0:ce16::d15f:1233 6.dishfire.r 6.grafana.lass.r 6.prometheus.lass.r 6.alert.lass.r -42:0:3c46:96e2:72f4:be89:d6eb:ab14 doctor.r -42:0:3c46:96e2:72f4:be89:d6eb:ab14 6.doctor.r -42:0:3c46:7f2f:ed62:c6fd:9f1b:9900 donna.r -42:0:3c46:7f2f:ed62:c6fd:9f1b:9900 6.donna.r 42:0:ce16::4 echelon.r 42:0:ce16::4 6.echelon.r 42:0:8809:2ef1:f4d5:6338:daa4:ba68 enklave.r cgit.enklave.r @@ -308,8 +284,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:e1a5:350a:770c:ec9:f353 6.rock.r 42:0:3c46:f99d:fde8:a301:1b09:caf4 rojava.r 42:0:3c46:f99d:fde8:a301:1b09:caf4 6.rojava.r -42:0:3c46:a5a1:618d:663a:f0f1:ec88 rose.r -42:0:3c46:a5a1:618d:663a:f0f1:ec88 6.rose.r 42:0:3c46:e3ce:cacc:bd95:dc9f:bc85 rtjure.r 42:0:3c46:e3ce:cacc:bd95:dc9f:bc85 6.rtjure.r 42:0:3c46:53a7:e0e3:a2b6:471d:44a ryan.r diff --git a/hosts/amy b/hosts/amy deleted file mode 100644 index 8cf38dd..0000000 --- a/hosts/amy +++ /dev/null @@ -1,20 +0,0 @@ -Subnet = 10.243.29.181 -Subnet = 42:0:3c46:1551:1906:bc7c:801f:3c4 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAr3jQRA1+hLKYVgHJA2ax5W8J3GVMTnaGpYw9Q2xXXrX/jxLZ6Ia8 -hBjIcCBDVL5Q3FnyrKB9NJeeIvCOKg8WG+8O0+wKcePKd0Vhbsx4Whog/6PWs6qh -q2sURs2tp1hjHks4kZo2WtiYD7Ue9HHdV6FlUO6yuBV0bW2RzHdLPCDSGxnQVkBM -tSwAvMCZwvVBiv4m6RyMXqmpdbAPBzgJcmJS0FY+zGxpiwsR/AdoVvnzYyFMCVpG -iFl5+k9OGhUJq72MwAXzjW5ZdCPrG+2Dd+QBhhtIMJGA2sJiJteT8vdvpTNCiHJ/ -HnW7movliN2mW86qwo7QqB5v0c9f9TjfpOld7sS/4vE3zlGi/Stf6SQWaoXez/u3 -/P9GzupcYgj76m8Z3j7BMHXCBw8iwP2pZpL9hnLdIyCcyLrzXDIzq4hlt60DPhSU -klTDBUA/cUdSJGcSn2N+WHLOTfI6qeBNKqcTk70OQsa69jAJeAtA+I9OprNYOXqb -MmQakNNlrTaNtGQxfQqEL+wqHlo8CVDGm3O9pQSNF309P4TLNU1EYm+ItScNiVCE -DKhcgvE6xHCwZnVyJN8MMy1CVyDmnHVYoaTEZ2cCvNi/hXIXgO9KWjSpAv5tP764 -UkOE4dlDpEW6G1pNf84BERfRYGDj29A/Jk9LJC/6D09QJXNu18HR0sUCAwEAAQ== ------END RSA PUBLIC KEY----- - -Ed25519PublicKey = 6VktF9Fg9E0hCW5g+rwGnrPACPSx/8vkl+hPNaFYeND - -Weight = 300 diff --git a/hosts/clara b/hosts/clara deleted file mode 100644 index 11fa882..0000000 --- a/hosts/clara +++ /dev/null @@ -1,20 +0,0 @@ -Subnet = 10.243.29.182 -Subnet = 42:0:3c46:e4e9:7814:459b:3f23:f455 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA07G1n2sA804nnjWQzq0Fi9i6kxJUo+jVJjtkm5unw3hjflAAd/3d -WN+01GdJCk/gr7DfU/Xr5KnR39Z3ADoT1tbUb+i5AJZ5/8VHUwWM8D8mQAam6LBf -UEeLxhVH8rG6lHaKwVi9oe4gPhgptUOzX/YIlJOMYDlYRxc7Wbj7YQOAKlPuTAjY -Z5bLswfkqTMO0cioJNwwMCNWSMJf3jbKi3eTQ36sf7TDMEneNGSBUpeSjGddoNT/ -rrVIDDT8tGmtACKr+3Y0H+EA2K5IxdQKKfnPRR31RBWiTkEXBbaJzYO/ZV5/xlbN -wmblskwq9d9IwDY7qeMctci+ZUZ3epG8MUwYa4faOrgmmkQpa5B+6UOMzw/WDJEc -jTfvSzfPo4anoj8C+MOQYzRvYmp60YEZKomv2BQdBvpGIpUul8WAR2aV0K+wz66e -mUamljAXmLiPxgGKduX5VFVuXzYxeMiBBujQCLTjc+xTB2EdwihxNX1rkxz10BDc -WrgPV+/VVyThKhOvVCifWARHtT2VGcZazfQOW/y3ZmEPOYuc5ZvrSEiMeG3f64+v -UU8cQZ3yBLIhTtC+38pRlsdBQHt526q0j0rrnd30JXVAUdWBunP2UJ5QGtA8/mWn -cWSlvRf5sfbyrISz6+mLPM2qGHnCkKwORNxmv/1DY07O3Rn6hX0OY4ECAwEAAQ== ------END RSA PUBLIC KEY----- - -Ed25519PublicKey = qnJmS6W7QSKG3mjW1kPnHGeVmKzhGkyP9xBLGwH5XvD - -Weight = 300 diff --git a/hosts/doctor b/hosts/doctor deleted file mode 100644 index 7fd8262..0000000 --- a/hosts/doctor +++ /dev/null @@ -1,15 +0,0 @@ -Subnet = 10.243.29.186 -Subnet = 42:0:3c46:96e2:72f4:be89:d6eb:ab14 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAx0zdjPX9C0fBQR+8kdlsBTuMr4KxWhqw4ARqW02oSGKJxY+D57oO -ORVfjBhrvIiZJfXaY0M+/n+M4Bvt4r5ol3N1NxkT7vc0bAbz9Kk/0M8dlspNoSO9 -WW+mITVfxg/DgzDegjj4TOrsWC1jBjo4PVrvA+PnxZC4VucnqZZ55JHWAk/mPtzs -PUc3mkn3e9pwwrJMQRy7qg9fbatljHCb/fJoDk6DiQP4ZRE/pCf4OYCx7huHibsd -EMp7y5QJySmKwJ/XsS6yiHeYXLFwWvfReja/IRFL4RiDSW+6ES4PTEXxoLVDpqgv -KF44qim4UBabCMTPVtZcU3Rr+ufBALKJCwIDAQAB ------END RSA PUBLIC KEY----- - -Ed25519PublicKey = PmZ8i6lB0Ij/d8qjA0y3QI2rMAlrTZn1ES/hUSNNWMP - -Weight = 300 diff --git a/hosts/donna b/hosts/donna deleted file mode 100644 index 8908804..0000000 --- a/hosts/donna +++ /dev/null @@ -1,21 +0,0 @@ -Address = 129.215.165.54 655 -Address = 2001:630:3c1:164:30a2:6e7b:c58b:cafd 655 -Subnet = 10.243.29.180 -Subnet = 42:0:3c46:7f2f:ed62:c6fd:9f1b:9900 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAnv5zVPwjHk5Q72D3tv2rlQkp7SOsZD7Wvz8l1yI/mWkxoriJ9MVa -x8RziSB3KF8sF1lRWIKmuynkgLI3w0X/YFs/fAvtayxk6Qf8DOl23Vd8Is0h/i3I -0fCmCEIHhHboKsREW6NxY7w5WAI2+SFNmGef1P7vzrAv7iLyPbo9nQ8wlrAmc+PJ -Ao3BOf4U7kP778fhsPA4dlGtF2v9CBhygeGVI/DQR8jcvzeiPd2Dr0k/JvrVMYtf -wJW4xUwZkIpws/yfI8b4VJOFl2X/Yw9712Z8Jvga0rR32OG4YbnggvuCMum1g94k -YwMjaSckv1XTalvPQuf1Od96XzwL2hjPFpEK3Tdl4AitMnArgj9HNzhcRL+eGonf -U24zk52OToHnoP3palNpodi7DziIBeXIaIMl7VMXku2ymbOUJsI6zeew+uZahJkv -QIWjxveQ8N40BoTc8Yg6pea1AId3l4f3brtwJbQOVbb3bVQ5VcrxM9Q/TBvyADYR -Knwszxw3uBw5Za1FMbwCPwd8/y/Ar19qGCx25xK0QnsyqZZT/cHsbBOTzh6BBWwI -IzbYu49VO/B1rktYzZ2l2ENQy6OILXWbvFjC8Pt8f1ZZQ4A21PyNA1AdyJ/rbVj7 -awm3OnnvKSvMCXWnwHPFHjksb3qMx96Aep1cw3ZBx0sQQ41UWBoOsi8CAwEAAQ== ------END RSA PUBLIC KEY----- - -Ed25519PublicKey = ikUmx5IC1dvfaHFhpZM9xotwF2LH6EkvpcPTRm6TjeD - diff --git a/hosts/rose b/hosts/rose deleted file mode 100644 index 8958071..0000000 --- a/hosts/rose +++ /dev/null @@ -1,21 +0,0 @@ -Address = 129.215.165.52 655 -Address = 2001:630:3c1:164:6d4:c4ff:fe04:4e4b 655 -Subnet = 10.243.29.178 -Subnet = 42:0:3c46:a5a1:618d:663a:f0f1:ec88 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA0h88uEcgVFhggGh3xqHySt8T+oDdoSN8ve4ZPmMzrGCD4dnlWcUO -6uMiwE7XG667wvjB0J2RbCJ8n8/r6eQgp6sRfPzSQL/Mc74J+py+sOVOjjjL5wJX -btrYmASO3GKUSMhGmM0IiwHMIPrmUViaREDrweF3bUwK45d/ocqpBkc+nF27kksd -DMYjHMWRIkKuQaj592zo/kY1pAJ/yAvDPess0x1CLL6uDNbjTr2S/L7JHdzZs9Xq -1+SGdVtqD0sWgSBKA0PC/Mi+Divd4PC1SoSL7wZRWD0Y2DNgj3+xUc7hAWRCw2Gs -5wofK+qiwnyYAmeNYcyQfDLosKZF9hOM8U3UbxptkPLsOK3cfZoGoLQCuOryVDBe -6GfJkJ49WfuSSNWs3WPWL6/6zmVPeGR0TvoMt02VQ3cKTmeIkWyTIzSVoC7wYv5D -Dl8Xt3aFr9UFI2GxenesViyuDLi8cy2fOsM3r+gowXQtgEKoXc9W2vyPwIIlcWUJ -QrKVsyNlkKKL0YjsnGazaEvqdiE30/Iq7f7VBnXnWXRLnZhr85HbTdDQnpT4GcEv -W3jpl1y5zShr5Hz90QoYcUTsxg9uk/+yqKpwUySZ6Gh4q0bo5k7nkM9i8mCMfNGZ -0UU94QmwS9RoV4Mt4pSLYRcCs0mVeEjLuIfTFHkXc6LCjBWMn8ICfeMCAwEAAQ== ------END RSA PUBLIC KEY----- - -Ed25519PublicKey = 0O1LrgXAFOuei1NfU0vow+qUfim3htBOyCJvPrQFwHE -