From 3f1384b11f13b71f1fd75df8b5776125c645dc22 Mon Sep 17 00:00:00 2001 From: gitea Date: Sun, 2 Apr 2023 10:00:09 +0000 Subject: [PATCH] automatic update --- etc.hosts | 34 ++++++++++++++++++---------------- etc.hosts-v6only | 18 ++++++++++-------- hosts/aland | 20 -------------------- wiregrill.json | 13 +++++++++++++ 4 files changed, 41 insertions(+), 44 deletions(-) delete mode 100644 hosts/aland diff --git a/etc.hosts b/etc.hosts index 451ac48..b0149a3 100644 --- a/etc.hosts +++ b/etc.hosts @@ -128,10 +128,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.100.100 4.ahorn.r 42:0:3c46:519d:1696:f464:9756:8727 ahorn.r 42:0:3c46:519d:1696:f464:9756:8727 6.ahorn.r -10.243.12.34 aland.r -10.243.12.34 4.aland.r -42:0:3c46:2868:6ad:5cdf:209a:943e aland.r -42:0:3c46:2868:6ad:5cdf:209a:943e 6.aland.r 10.243.21.1 alnus.r 10.243.21.1 4.alnus.r 42:0:a46e:99a9:9166:ae88:208:9645 alnus.r @@ -182,10 +178,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.136.236 4.cake.r 42:0:e644:ab0:32cd:b619:1962:5 cake.r 42:0:e644:ab0:32cd:b619:1962:5 6.cake.r -10.243.13.12 catalonia.r -10.243.13.12 4.catalonia.r -42:0:3c46:872f:60bd:5179:38b3:cba9 catalonia.r -42:0:3c46:872f:60bd:5179:38b3:cba9 6.catalonia.r +10.243.13.12 catalonia.xkey.r +10.243.13.12 4.catalonia.xkey.r +42:0:3c46:872f:60bd:5179:38b3:cba9 catalonia.xkey.r +42:0:3c46:872f:60bd:5179:38b3:cba9 6.catalonia.xkey.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 @@ -496,10 +492,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:f7cf:5f5a:8ed8:f139:be6d 6.river.r 42:0:3c46:e1a5:350a:770c:ec9:f353 rock.r 42:0:3c46:e1a5:350a:770c:ec9:f353 6.rock.r -10.243.23.42 rojava.r -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.23.42 rojava.xkey.r +10.243.23.42 4.rojava.xkey.r +42:0:3c46:f99d:fde8:a301:1b09:caf4 rojava.xkey.r +42:0:3c46:f99d:fde8:a301:1b09:caf4 6.rojava.xkey.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 @@ -534,10 +530,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.0.4 4.shodan.r 42:0:ce16::50da shodan.r 42:0:ce16::50da 6.shodan.r -10.243.161.1 sicily.r mukke.r -10.243.161.1 4.sicily.r 4.mukke.r -42:0:3c46:88db:5123:1258:528f:bd9e sicily.r mukke.r -42:0:3c46:88db:5123:1258:528f:bd9e 6.sicily.r 6.mukke.r +10.243.161.1 sicily.xkey.r mukke.r +10.243.161.1 4.sicily.xkey.r 4.mukke.r +42:0:3c46:88db:5123:1258:528f:bd9e sicily.xkey.r mukke.r +42:0:3c46:88db:5123:1258:528f:bd9e 6.sicily.xkey.r 6.mukke.r 10.243.133.116 skynet.r 10.243.133.116 4.skynet.r 42:0:ce16::5ce7 skynet.r @@ -660,12 +656,18 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:3c46:eac1:fdee:430d:40bd:57de 6.ada.w 42:1:ce16::ae12 aergia.w 42:1:ce16::ae12 6.aergia.w +10.244.12.34 aland.xkey.w +10.244.12.34 4.aland.xkey.w +42:1:3c46:2868:6ad:5cdf:209a:943e aland.xkey.w +42:1:3c46:2868:6ad:5cdf:209a:943e 6.aland.xkey.w 42:1:a46e:99a9:9166:ae88:208:9645 alnus.w 42:1:a46e:99a9:9166:ae88:208:9645 6.alnus.w 42:1:ce16::b1ce blue.w 42:1:ce16::b1ce 6.blue.w 42:1:ce16::17 coaxmetal.w 42:1:ce16::17 6.coaxmetal.w +42:1:3c46:ac45:3f4c:e530:ef19:16b cybercube.xkey.w +42:1:3c46:ac45:3f4c:e530:ef19:16b 6.cybercube.xkey.w 42:1:ce16::daed daedalus.w 42:1:ce16::daed 6.daedalus.w 10.244.1.17 domsen-pixel.w diff --git a/etc.hosts-v6only b/etc.hosts-v6only index 19ad678..511f8ef 100644 --- a/etc.hosts-v6only +++ b/etc.hosts-v6only @@ -120,8 +120,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:ce16::ae12 6.aergia.r 42:0:3c46:519d:1696:f464:9756:8727 ahorn.r 42:0:3c46:519d:1696:f464:9756:8727 6.ahorn.r -42:0:3c46:2868:6ad:5cdf:209a:943e aland.r -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 @@ -152,8 +150,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:a46e:dcc0:9508:394f:e63a:491f 6.bu.r 42:0:e644:ab0:32cd:b619:1962:5 cake.r 42:0:e644:ab0:32cd:b619:1962:5 6.cake.r -42:0:3c46:872f:60bd:5179:38b3:cba9 catalonia.r -42:0:3c46:872f:60bd:5179:38b3:cba9 6.catalonia.r +42:0:3c46:872f:60bd:5179:38b3:cba9 catalonia.xkey.r +42:0:3c46:872f:60bd:5179:38b3:cba9 6.catalonia.xkey.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 @@ -326,8 +324,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:f7cf:5f5a:8ed8:f139:be6d 6.river.r 42:0:3c46:e1a5:350a:770c:ec9:f353 rock.r 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:f99d:fde8:a301:1b09:caf4 rojava.xkey.r +42:0:3c46:f99d:fde8:a301:1b09:caf4 6.rojava.xkey.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 @@ -348,8 +346,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:e644:d21:6292:46e0:57e:23e5 6.senderechner.r 42:0:ce16::50da shodan.r 42:0:ce16::50da 6.shodan.r -42:0:3c46:88db:5123:1258:528f:bd9e sicily.r mukke.r -42:0:3c46:88db:5123:1258:528f:bd9e 6.sicily.r 6.mukke.r +42:0:3c46:88db:5123:1258:528f:bd9e sicily.xkey.r mukke.r +42:0:3c46:88db:5123:1258:528f:bd9e 6.sicily.xkey.r 6.mukke.r 42:0:ce16::5ce7 skynet.r 42:0:ce16::5ce7 6.skynet.r 42:0:e644:c47a:538d:7d9f:e78e:7baa snake.r @@ -418,12 +416,16 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:1:3c46:eac1:fdee:430d:40bd:57de 6.ada.w 42:1:ce16::ae12 aergia.w 42:1:ce16::ae12 6.aergia.w +42:1:3c46:2868:6ad:5cdf:209a:943e aland.xkey.w +42:1:3c46:2868:6ad:5cdf:209a:943e 6.aland.xkey.w 42:1:a46e:99a9:9166:ae88:208:9645 alnus.w 42:1:a46e:99a9:9166:ae88:208:9645 6.alnus.w 42:1:ce16::b1ce blue.w 42:1:ce16::b1ce 6.blue.w 42:1:ce16::17 coaxmetal.w 42:1:ce16::17 6.coaxmetal.w +42:1:3c46:ac45:3f4c:e530:ef19:16b cybercube.xkey.w +42:1:3c46:ac45:3f4c:e530:ef19:16b 6.cybercube.xkey.w 42:1:ce16::daed daedalus.w 42:1:ce16::daed 6.daedalus.w 42:1:ce16::d0 domsen-pixel.w diff --git a/hosts/aland b/hosts/aland deleted file mode 100644 index c2fb9ef..0000000 --- a/hosts/aland +++ /dev/null @@ -1,20 +0,0 @@ -Subnet = 10.243.12.34 -Subnet = 42:0:3c46:2868:6ad:5cdf:209a:943e - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAwR1e8/4Lx7gqSyFhA5WpfT4LsnXqYARR6y+gYAOSre6wMvBm/OBY -CKEYCCfqQD3naukID9FqleXaZdIxp6xxBIYZ1yi1Xn032MPP0S37oZAxJlXvlEaU -plG9ct6Zh6qTzpghP2UyYD4RxhLwvsRTycwLF93D+a1z1/CNNDLSoTS11BLtvhDb -DmxTVY/1hWJUiVR4KyRsYnJ3N1Heg/4R/Su4oFm+DatfFYdzhaNsk9q3YYIRdRcx -aHLF65ygVTjG/rUJp/OvkeU1G5rc0ldpd7zR8N8kkjgI1lmZe50mUGghKr1zexV+ -OkIjXGrwTk4RZk3kZO6PZu56rrsR8HZirfrtJWRy7UgAm3S/lZku7X4SN3+7pfL1 -ero6/XB4CHeQ9OpQemcR5o6AR0ncE0TApqeoLd1U710XmwM09ifawAO3jm9ER19X -TKFHeBzqsToPmternXnAKgg2NYyKStkavQu6JTl/uOXdfqfMc9TU6mzV8aBo7ZDa -aLdlg0phcFCcZT8zJGzA3des70AHWmQ7G49pBysnXk8p+1l3SPazGAlIWBCT6oZX -zUUauGEgsuTkDC+JijUm/1HrrMfiigHeBTZKPLqe/75MkumukXqTzd3zfUEcA5Vf -VgEnL2jNVFfocJtmhLQdkmnSiIQslRSOHMC94ZWa0ku0kHZ3XawwwY0CAwEAAQ== ------END RSA PUBLIC KEY----- - -Ed25519PublicKey = gOEzoUsuJyaGIjoZIyS9uZa+zLYfN6BEZrbCTeAWW7A - -Weight = 300 \ No newline at end of file diff --git a/wiregrill.json b/wiregrill.json index a75286d..9e25c76 100644 --- a/wiregrill.json +++ b/wiregrill.json @@ -11,6 +11,13 @@ ], "publicKey": "h2GFkqW1ThHpDiALrLkJEsR5NU1lXHvwk0Kers1vIxg=" }, + "aland": { + "allowedIPs": [ + "10.244.12.34", + "42:1:3c46:2868:6ad:5cdf:209a:943e" + ], + "publicKey": "m2IymGYQiRma2cyZbwRsOw1rCpB5ZdFkfYII1hnHzGE=" + }, "alnus": { "allowedIPs": [ "42:1:a46e:99a9:9166:ae88:208:9645" @@ -29,6 +36,12 @@ ], "publicKey": "lkjR14oOVKl03/0sUzOmddf28ps+v5qRxrbRY03Pg38=" }, + "cybercube": { + "allowedIPs": [ + "42:1:3c46:ac45:3f4c:e530:ef19:16b" + ], + "publicKey": "ZPOCyThKQUlR/gPFWoJ4XICHYFMNtI70XH+y5v2f6VQ=" + }, "daedalus": { "allowedIPs": [ "42:1:ce16::daed"