diff options
| -rwxr-xr-x | retiolum/bin/check-free-retiolum-v4 | 2 | ||||
| -rw-r--r-- | retiolum/hosts/albi10 | 11 | ||||
| -rw-r--r-- | retiolum/hosts/also | 12 | ||||
| -rw-r--r-- | retiolum/hosts/iiso | 11 | ||||
| -rw-r--r-- | retiolum/hosts/oxberg | 11 | ||||
| -rw-r--r-- | retiolum/hosts/xso | 10 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh | 6 |
7 files changed, 15 insertions, 48 deletions
diff --git a/retiolum/bin/check-free-retiolum-v4 b/retiolum/bin/check-free-retiolum-v4 index 3f0dbdf8..3492f7f6 100755 --- a/retiolum/bin/check-free-retiolum-v4 +++ b/retiolum/bin/check-free-retiolum-v4 @@ -1,6 +1,6 @@ #! /bin/sh netname=retiolum -myipv4=${1-10.7.7.-1} +myipv4=${1-10.243.0.-1} v4num=${myipv4##*.} printf "Retard check: " if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ]; diff --git a/retiolum/hosts/albi10 b/retiolum/hosts/albi10 new file mode 100644 index 00000000..5f152a1f --- /dev/null +++ b/retiolum/hosts/albi10 @@ -0,0 +1,11 @@ +Address = 184.154.13.15 +Subnet = 10.243.0.10 +Subnet = 42:aaa9:4ba3:8c43:bdd8:2cc8:29a0:e8e6/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA0Jz5rQ7NpIQWwhDsrZHlJYAnC1k1onl2ln/6CJbdV9t3gG2hlx/9 +0SEARo6sq9fftyzzZd3iY4WK7+zRXJFXHsLmDa6mq8Mme7Yv+YHZoHPTm9c3tN3v +laiV/qAdoi/sv43DCo7JywI2lTW1pPxuitXuud2ajd7GXuCoRqFRqLtaURorVKkW +4j9UGpMKrEa+CV9wP5jZ57RSPQ7aMq8D4GiMqKDgUeCZnvXxpYWDOEdGNlpuUcWt +/erC6u50/vnjUkkHx66OmkZe5AX5MmwNp2q4zC4sTh/BRhqk27AmNl5wbp0kL7/B +hg+r0F8ckrdLc21sSU36lUIeeFa/S+A06QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/also b/retiolum/hosts/also deleted file mode 100644 index 59a251a7..00000000 --- a/retiolum/hosts/also +++ /dev/null @@ -1,12 +0,0 @@ -Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 -Subnet = 23.42.0.1/16 -Subnet = 10.243.0.50/32 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry -Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ -llgUfRETQd/2KaIfJWH/nVsBuK0hp1LscroWcoO08BCw6v94q3He8502Bk/ZYZQF -wD7Y6LldipWKo/K9YtIU3zD3taj2NGnetOc0BRRncSgGiicXJKhtfcs+Ti2Y/ITz -bFkHnFgB0KnhjwJBumxdmgjHWknlwVkROvmzIgyoXxqEw31bF+g/XzA7RTMXsiFM -w0SZ15k4HG5L1PWpUyY2Th5yIjMW+sSrhQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/iiso b/retiolum/hosts/iiso deleted file mode 100644 index 3700cec5..00000000 --- a/retiolum/hosts/iiso +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 42:b2cd:6c75:d528:e736:ec4e:fc39:8bdc/128 -Subnet = 10.243.0.37/32 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAvsjBR0FUkjiNNLhz3AArosLqEiLZY7O8L6LorfUplD/IjG9P7XXx -ry4gbKEH57GPn11IOPP1AKQcz7SfW7EwvUS8U1IZgkQq8BuuD3oGBQxOqwnOwzVN -+XKSZjUfmT/Uf81PHfWE52BfbitI+SBTi0m9cIuhgyYRAjD7We97ogkWDogBXKvC -p1YYH44wcLte7lzWmId9hNOJtTu4KnCVgtXi/DYVLvuofrEk28DhhRSFiun4dkN6 -qMl8ZWOILOhUVSZN+cx/dslCwoog1FuEj7TyuhJFj8yoWIdI4xUGugzmV6npzTvU -bLkcVfuQQYlIV9D7YYPyEFB11U6mifZ5uwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/oxberg b/retiolum/hosts/oxberg deleted file mode 100644 index c267b582..00000000 --- a/retiolum/hosts/oxberg +++ /dev/null @@ -1,11 +0,0 @@ -Address = 84.23.80.172 -Subnet = 42:c154:3219:a91c:77eb:91bb:2f18:ff75/128 -Subnet = 42.160.213.134/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA57j66efrYrB7jlBVu6XD6433n/j1QL86KI/l7BCVTE11mJrElElc -YSAOB44arnFurSlU8RZIZAC4gnScmDnjJqCqudxps4wO0JTPqUCvUXkaZQ1fUf7W -H00K05Jkrr6xFHyDwZNrU4uitBfMuAXlUE2A0sFLJiBmFLMSS0abaUg0ALRwFsMI -5ftLHZPMV/TwUollCHQTfwMiMGo28WBm+nYvY+nUZRu3sx8HPLskYWmvt9giu7eo -iQCDee/bHym5Ax9vETpCrkZITq2MJtQdJX46iwvlgKxsV7VkCXAtmU3lMLyTSeRX -582RdmjFP2DdTPEulbL2YyfXVuLs0QIiRQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/xso b/retiolum/hosts/xso deleted file mode 100644 index 1f035a78..00000000 --- a/retiolum/hosts/xso +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:fb16:96ad:c849:f5d4:2170:103d:e86b/128 -Subnet = 42.124.174.80/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA1p1WG0yDOku0u8XPzN2BAcrkVeR11c8Si3sz2BNoYPitdA2wW/TE -mHjGw4Dxt1Q+lWmxtsNnV2x5IoZBSIovS8Tuj4O6mVTmgSJSta988gzmeImQksb6 -+/d4LQmqc6/u24sKrWEPQ7sCpb5sPGr1K1yLNtAnD7pt3rGiX/VK/SKBYKpB5wGf -snRHB5fj/4yc5M7YjQI+TO0jTKdlf9B4JrRX/DhbmZ9n/EPGREGUgrDyi66Jk8ea -yRyCg/5UcHD6z74ZN6Is4bbQXZaQ4S61r+JmFebsC2CxkZ20jayDBRKcQL6yH0ZZ -a1rAdUqyh894vNctn52GAp7P96dhwAnwEQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 2e36b83a..a72d2b8b 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -45,7 +45,7 @@ then then printf 'select v4 subnet ip (1-255): ' read v4num - until $MYBIN/check-free-retiolum-v4 $v4num; do + until $MYBIN/check-free-retiolum-v4 10.243.0.$v4num; do echo "your're an idiot!" printf 'select unused v4 subnet ip (1-255): ' read v4num @@ -63,8 +63,8 @@ fi cat>tinc.conf<<EOF Name = $myname ConnectTo = euer -ConnectTo = oxberg -ConnectTo = pa_sharepoint +ConnectTo = albi10 +ConnectTo = pigstarter ConnectTo = supernode Device = /dev/net/tun EOF |