diff --git a/etc.hosts b/etc.hosts index a5f269c..8640c59 100644 --- a/etc.hosts +++ b/etc.hosts @@ -404,6 +404,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.20.1 4.mu.r 42:0:a46e:3cd3:1950:3ea6:785e:e124 mu.r 42:0:a46e:3cd3:1950:3ea6:785e:e124 6.mu.r +10.243.0.42 murks.r +10.243.0.42 4.murks.r +42:0:2c4b:29bf:c7e4:6775:339e:2a0 murks.r +42:0:2c4b:29bf:c7e4:6775:339e:2a0 6.murks.r 10.243.42.64 mystacocarida.crustacea.r 10.243.42.64 4.mystacocarida.crustacea.r 42:0:4a6f::4264 mystacocarida.crustacea.r @@ -640,10 +644,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:ca48:b76a:f76b:61b9:62db:75b 6.wolf.r 6.build.wolf.r 6.cgit.wolf.r 6.lounge.mpd.wolf.r 42:0:3c46:6cfb:9e45:68c0:c60c:61c4 srounce.r 42:0:3c46:6cfb:9e45:68c0:c60c:61c4 6.srounce.r -10.243.13.37 wu.r cgit.wu.r -10.243.13.37 4.wu.r 4.cgit.wu.r -42:0:a46e:b17d:cf4e:39ae:462a:f95 wu.r cgit.wu.r -42:0:a46e:b17d:cf4e:39ae:462a:f95 6.wu.r 6.cgit.wu.r 10.243.0.91 x.r 10.243.0.91 4.x.r 42:0:e644:162:2d71:1642:b726:b044 x.r @@ -790,8 +790,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.244.3.101 4.umz.w 42:1:a46e:656:944f:2308:3343:1e36 umz.w 42:1:a46e:656:944f:2308:3343:1e36 6.umz.w -42:1:a46e:b17d:cf4e:39ae:462a:f95 wu.w -42:1:a46e:b17d:cf4e:39ae:462a:f95 6.wu.w 10.243.245.6 x.w 10.243.245.6 4.x.w 42:1:e644:162:2d71:1642:b726:b044 x.w diff --git a/etc.hosts-v6only b/etc.hosts-v6only index 48f4acf..346fe50 100644 --- a/etc.hosts-v6only +++ b/etc.hosts-v6only @@ -284,6 +284,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:ce16::dea7 6.mors.r 42:0:a46e:3cd3:1950:3ea6:785e:e124 mu.r 42:0:a46e:3cd3:1950:3ea6:785e:e124 6.mu.r +42:0:2c4b:29bf:c7e4:6775:339e:2a0 murks.r +42:0:2c4b:29bf:c7e4:6775:339e:2a0 6.murks.r 42:0:4a6f::4264 mystacocarida.crustacea.r 42:0:4a6f::4264 6.mystacocarida.crustacea.r 42:0:3c46:362d:a9aa:4996:c78e:839a nardole.r @@ -412,8 +414,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:ca48:b76a:f76b:61b9:62db:75b 6.wolf.r 6.build.wolf.r 6.cgit.wolf.r 6.lounge.mpd.wolf.r 42:0:3c46:6cfb:9e45:68c0:c60c:61c4 srounce.r 42:0:3c46:6cfb:9e45:68c0:c60c:61c4 6.srounce.r -42:0:a46e:b17d:cf4e:39ae:462a:f95 wu.r cgit.wu.r -42:0:a46e:b17d:cf4e:39ae:462a:f95 6.wu.r 6.cgit.wu.r 42:0:e644:162:2d71:1642:b726:b044 x.r 42:0:e644:162:2d71:1642:b726:b044 6.x.r 42:0:ce16::3 xerxes.r @@ -514,8 +514,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:ce16::b1c 6.ubik.w 42:1:a46e:656:944f:2308:3343:1e36 umz.w 42:1:a46e:656:944f:2308:3343:1e36 6.umz.w -42:1:a46e:b17d:cf4e:39ae:462a:f95 wu.w -42:1:a46e:b17d:cf4e:39ae:462a:f95 6.wu.w 42:1:e644:162:2d71:1642:b726:b044 x.w 42:1:e644:162:2d71:1642:b726:b044 6.x.w 42:1:ce16::3 xerxes.w diff --git a/hosts/murks b/hosts/murks new file mode 100644 index 0000000..2cc0453 --- /dev/null +++ b/hosts/murks @@ -0,0 +1,20 @@ +Subnet = 10.243.0.42 +Subnet = 42:0:2c4b:29bf:c7e4:6775:339e:2a0 + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAsooKgG5zkt4lPY7ROxnwuGuDTfN9YZPsKHnENjmzvMkfdwdM3aGW +2fkZfn8Q8pQ0eJaTJ8/Lavk1LKOB5pgkuloyOtPfpmJY++LAn37rNxnQvUWP3kS4 +JJ78whRJqczO4b3TEh2Dm/DsvH3E/Gpwq5TXiRzbjQ9hspZlPptRkda0UveAh1fn +wFVBtUEOmQZ3cpGCAdo2sMcBoZwJXSQAm4z2P+eTXXo2IIjWgS8zQu5nvX/y4RG8 +D+HSe/X58yVRww4ABU4g7cNzzqLVKFEAuznlmpiZZ6EMGZ7xbZQlDmJuAIHIXrn+ +JVc1Yo/WmFYbN/6CmIUHE80/434Zg1dK87honUXizeDO2cyIb1vEG432Eqd3TsG7 +3YjJOHqaiNqBd60tFrT87mjbuCiD6jKlA5AQtzSSdDhq8G0i0Il8Do6SnpY2ACx2 +CvF6s3sWXP3YtY/AupB+okPoqvC+96Oxs2KJwQSatQlDr0aarror19NKC6b/Y4qo +C0tcDa7VZiOB+rM6iIjRiM3QEyWEBia3nj2n5T98DgPooqmSF2p4NKYcaBMSv3f5 +aD2oZzdBqZnPAbi2CNoNN9pdVOB0Ckt9DaiMaiROEeAvxL3xxwaWhMPBFbSvGhca +ciMdqaPlgqKu7WGtmU4a0U3JXhWTjin1mroD3kduykgek4fAmvcP540CAwEAAQ== +-----END RSA PUBLIC KEY----- + +Ed25519PublicKey = 4ZAQxhHBUT9KSof2tjadgMHD5kxND0AtXgjdTzs/F+L + +Weight = 300 \ No newline at end of file diff --git a/hosts/wu b/hosts/wu deleted file mode 100644 index c6d87d0..0000000 --- a/hosts/wu +++ /dev/null @@ -1,15 +0,0 @@ -Subnet = 10.243.13.37 -Subnet = 42:0:a46e:b17d:cf4e:39ae:462a:f95 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEArDvU0cuBsVqTjCX2TlWL4XHSy4qSjUhjrDvUPZSKTVN7x6OENCUn -M27g9H7j4/Jw/8IHoJLiKnXHavOoc9UJM+P9Fla/4TTVADr69UDSnLgH+wGiHcEg -GxPkb2jt0Z8zcpD6Fusj1ATs3sssaLHTHvg1D0LylEWA3cI4WPP13v23PkyUENQT -KpSWfR+obqDl38Q7LuFi6dH9ruyvqK+4syddrBwjPXrcNxcGL9QbDn7+foRNiWw4 -4CE5z25oGG2iWMShI7fe3ji/fMUAl7DSOOrHVVG9eMtpzy+uI8veOHrdTax4oKik -AFGCrMIov3F0GIeu3nDlrTIZPZDTodbFKQIDAQAB ------END RSA PUBLIC KEY----- - -Ed25519PublicKey = urVOEGxTkBedkpszPH0XRCRMk+Fc2U9IneYMFDqGoIB - -Weight = 300 \ No newline at end of file diff --git a/wiregrill.json b/wiregrill.json index 1e1c474..2ec0b63 100644 --- a/wiregrill.json +++ b/wiregrill.json @@ -280,12 +280,6 @@ ], "publicKey": "FpghL2Drdg+xwqcOsDgePgUx3X3XsX9f56BPLuF690g=" }, - "wu": { - "allowedIPs": [ - "42:1:a46e:b17d:cf4e:39ae:462a:f95" - ], - "publicKey": "68bL6l3/sjbirva80tm0Dw6/PJu1S95nJC58gWCh42E=" - }, "x": { "allowedIPs": [ "10.243.245.6",