diff options
Diffstat (limited to 'playbooks.d/vpn-tinc')
-rw-r--r-- | playbooks.d/vpn-tinc/playbook.bash | 148 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/host | 4 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/anoia_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/caeghi_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/denahnu_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/edephas_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/faiwoo_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/gaeru_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/hurzak_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/ivdea_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/jaomox_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/hosts/krohxe_tyil_net | 16 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/tinc-up-ifconfig | 1 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/tinc-up-ip | 1 | ||||
-rw-r--r-- | playbooks.d/vpn-tinc/share/tinc.conf | 7 |
15 files changed, 106 insertions, 215 deletions
diff --git a/playbooks.d/vpn-tinc/playbook.bash b/playbooks.d/vpn-tinc/playbook.bash index 9cce9a6..485c6e6 100644 --- a/playbooks.d/vpn-tinc/playbook.bash +++ b/playbooks.d/vpn-tinc/playbook.bash @@ -1,69 +1,85 @@ #!/usr/bin/env bash +# shellcheck disable=SC2034 + +BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.ipv4]="required" +BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.ipv6]="required" +BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.name]="required" + playbook_add() { - local tinc="$(config "app.tinc")" - local tincd="$(config "app.tincd")" - local dir="$(config "fs.etcdir")/tinc/tyilnet" - local name="$(tr "." "_" <<< "${BASHTARD_PLATFORM[fqdn]}")" - local ipv4="$(config "vpn.ipv4")" - - if [[ -z "$ipv4" ]] - then - emerg "$BASHTARD_PLAYBOOK" "No IPv4 address set for ${BASHTARD_PLATFORM[fqdn]}" - return 2 - fi + local data + local etc + local host + local iptool + local ipv4 + local ipv6 + local name + local tinc + local tincd + local port + + data="$(playbook_path "data")" + host="$(tr "." "_" <<< "${BASHTARD_PLATFORM[fqdn]}")" + ipv4="$(config "$BASHTARD_PLAYBOOK.ipv4")" + ipv6="$(config "$BASHTARD_PLAYBOOK.ipv6")" + name="$(config "$BASHTARD_PLAYBOOK.name")" + tinc="$(config "app.tinc")" + tincd="$(config "app.tincd")" + port="$(config "$BASHTARD_PLAYBOOK.port" "655")" + etc="$(config "fs.etcdir")/tinc/$name" case "${BASHTARD_PLATFORM[key]}" in freebsd) iptool=ifconfig ;; *) iptool=ip esac - info "$BASHTARD_PLAYBOOK" "Installing tinc" + info "$BASHTARD_PLAYBOOK/add" "Installing tinc" pkg install "tinc" - info "$BASHTARD_PLAYBOOK" "Creating tinc configuration at $dir" - mkdir -pv -- \ - "$dir" \ - "$dir/hosts" + info "$BASHTARD_PLAYBOOK/add" "Creating tinc configuration at $etc" - file_template tinc.conf \ - "name=$name" \ - > "$dir/tinc.conf" + mkdir -pv -- \ + "$etc" \ + "$etc/hosts" file_template "tinc-up-$iptool" \ - "ip4=$(config "vpn.ipv4")" \ - > "$dir/tinc-up" + "ip4=$ipv4" \ + "ip6=$ipv6" \ + > "$etc/tinc-up" file_template "tinc-down-$iptool" \ - "ip4=$(config "vpn.ipv4")" \ - > "$dir/tinc-down" + "ip4=$ipv4" \ + "ip6=$ipv6" \ + > "$etc/tinc-down" file_template "host" \ - "ip4=$(config "vpn.ipv4")" \ - > "$dir/hosts/$name" + "ip4=$ipv4" \ + "ip6=$ipv6" \ + "port=$port" \ + > "$etc/hosts/$host" chmod +x \ - "$dir/tinc-up" \ - "$dir/tinc-down" + "$etc/tinc-up" \ + "$etc/tinc-down" - info "$BASHTARD_PLAYBOOK" "Generating private keys" + info "$BASHTARD_PLAYBOOK/add" "Generating private keys" case "$($tincd --version | awk '{ print $3 }' | head -n1)" in 1.0*) - $tincd -n tyilnet -K4096 + $tincd -n "$name" -K4096 ;; 1.1*|*) - $tinc -n tyilnet generate-rsa-keys 4096 - $tinc -n tyilnet generate-ed25519-keys + $tinc -n "$name" generate-rsa-keys 4096 + $tinc -n "$name" generate-ed25519-keys ;; esac - info "$BASHTARD_PLAYBOOK" "Adding new host to Bashtard configs" - + info "$BASHTARD_PLAYBOOK/add" "Adding new host to Bashtard configs" + mkdir -pv -- "$data/hosts" cp -v -- \ - "$dir/hosts/$name" \ - "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/hosts/$name" + "$etc/hosts/$host" \ + "$data/hosts/$host" playbook_sync @@ -71,22 +87,22 @@ playbook_add() case "${BASHTARD_PLATFORM[key]}" in freebsd) - if ! grep -Fq 'tincd_cfg="tyilnet"' "/etc/rc.conf.d/tincd" + if ! grep -Fq 'tincd_cfg="'"$name"'"' "/etc/rc.conf.d/tincd" then - printf 'tincd_cfg="%s"\n' "tyilnet" >> "/etc/rc.conf.d/tincd" + printf 'tincd_cfg="%s"\n' "$name" >> "/etc/rc.conf.d/tincd" fi ;; linux-gentoo) - if ! grep -Fq "NETWORK: tyilnet" /etc/conf.d/tinc.networks + if ! grep -Fq "NETWORK: $name" /etc/conf.d/tinc.networks then - printf "NETWORK: %s\n" "tyilnet" >> /etc/conf.d/tinc.networks + printf "NETWORK: %s\n" "$name" >> /etc/conf.d/tinc.networks fi ;; esac case "${BASHTARD_PLATFORM[init]}" in systemd) - systemctl enable --now tinc@tyilnet.service + systemctl enable --now "tinc@$name.service" ;; *) svc enable "tinc" @@ -97,28 +113,50 @@ playbook_add() playbook_sync() { - local dir="$(config "fs.etcdir")/tinc/tyilnet" - local name="$(tr "." "_" <<< "${BASHTARD_PLATFORM[fqdn]}")" + local data + local etc + local hash local host + local iptool + local name + + data="$(playbook_path "data")" + etc="$(config "fs.etcdir")/tinc/$(config "$BASHTARD_PLAYBOOK.name")" + hash="$(dir_hash "$etc/hosts")" + host="$(tr "." "_" <<< "${BASHTARD_PLATFORM[fqdn]}")" + name="$(config "$BASHTARD_PLAYBOOK.name")" info "$BASHTARD_PLAYBOOK" "Regenerating tinc hosts" - rm -fr -- "$dir/hosts" - mkdir -p -- "$dir/hosts" + rm -fr -- "$etc/hosts" + mkdir -p -- "$etc/hosts" - for path in "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/hosts"/* + for path in "$data/hosts"/* do - host="$(basename "$path")" + file="$(basename "$path")" - notice "$BASHTARD_PLAYBOOK" "Updating host $host" - file_template "hosts/$host" \ - > "$dir/hosts/$host" + notice "$BASHTARD_PLAYBOOK" "Updating host $file" + cp -v -- "$data/hosts/$file" "$etc/hosts/$file" done + info "$BASHTARD_PLAYBOOK/sync" "Reconfiguring peers" + { + printf "Name = %s\n\n" "$host" + + while read -r peer + do + printf "ConnectTo = %s\n" "$(config "$BASHTARD_PLAYBOOK.peers.$peer")" + done < <( config_subkeys "$BASHTARD_PLAYBOOK.peers" ) + } > "$etc/tinc.conf" + + [[ "$BASHTARD_COMMAND" == "add" ]] && return + [[ "$hash" == "$(dir_hash "$etc/hosts")" ]] && return + + info "$BASHTARD_PLAYBOOK" "Reloading service" case "${BASHTARD_PLATFORM[init]}" in systemd) - systemctl reload tinc@tyilnet.service + systemctl reload "tinc@$name.service" ;; *) svc reload "tinc" @@ -128,9 +166,15 @@ playbook_sync() playbook_del() { + local etc + local name + + etc="$(config "fs.etcdir")" + name="$(config "$BASHTARD_PLAYBOOK.name")" + case "${BASHTARD_PLATFORM[init]}" in systemd) - systemctl disable --now tinc@tyilnet.service + systemctl disable --now "tinc@$name.service" ;; *) svc stop "tinc" @@ -140,5 +184,5 @@ playbook_del() pkg uninstall "tinc" - rm -frv -- "$(config "fs.etcdir")/tinc/tyilnet" + rm -frv -- "$etc/tinc/$name" } diff --git a/playbooks.d/vpn-tinc/share/host b/playbooks.d/vpn-tinc/share/host index c24d4ad..fbcdd4a 100644 --- a/playbooks.d/vpn-tinc/share/host +++ b/playbooks.d/vpn-tinc/share/host @@ -1,2 +1,4 @@ -Subnet = ${ip4}/32 +Port = ${port} +Subnet = ${ip4}/32 +Subnet = ${ip6}/128 diff --git a/playbooks.d/vpn-tinc/share/hosts/anoia_tyil_net b/playbooks.d/vpn-tinc/share/hosts/anoia_tyil_net deleted file mode 100644 index 4856c95..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/anoia_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Subnet = 10.57.100.3/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAvcW/20fxgdGdNelD/eMwEpLChI03rvDbPHAp9en3cwlYaND40udO -VxjRXj0rE9IA4N0f+o8oJdmG+mzl5Dd3rKXVnBnRymKzpNJ2w+cILPm1sQa6IO85 -F+7Q5v7lb5yFuy3JVi+tg4nqL+xHSZL6w/oPX667bR90oBJEd7C+U7p7r8DXvyHq -cg9U1maDmZ0IzZtl6BxsjyfUr0o6xBtw+pCSIvOXW5xd4mfBPgvp+3nIcux6nek3 -VR6SJ85aXlYZxER23N13Vi3dGUJSIaBPN5MuS3IHBbAP/Feeyo8p4SCzl0AMfo/K -+ZGcheL/NX7EVGg4XcZNgFaTBpusScOfxiRlzAeImomiQwKIywXp1otCn6dKIDj0 -jj146Dodf2nHRbTQj7H/2zyiRDjY/tpis/xTVA5AJu+p5aaXBA/eSb4H1OKL5qYs -38/bUiUJTSbpWvC9WiHq/xi5GSs+3ehDara89yXXhunWLsqvSZOZacqeZQw8k+ip -pNcnXbbtS0zqNQie3OEKY9qqOGKzjUiYu8yWJ4eo370XzlQ9sUgGfKmwCcc2c2jX -Rrhjck+4DGeRA10oJpoxKArPaWrGWezIHJ49Jrc+xiTJ5EMVqOpuGvL5lrKn7g6y -qYk1u6x0We1nCkMNN2LxrmL6j3p6PKRbWg7bczqPO4uEyT/575Ih2ssCAwEAAQ== ------END RSA PUBLIC KEY----- -Ed25519PublicKey = 7jy41lK2S4BzhUVSAmULDSiZ9NQM4eQ0Geg2+F9pTpG diff --git a/playbooks.d/vpn-tinc/share/hosts/caeghi_tyil_net b/playbooks.d/vpn-tinc/share/hosts/caeghi_tyil_net deleted file mode 100644 index c5d5b05..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/caeghi_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Address = 116.202.102.33 -Subnet = 10.57.20.2/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA2abFKFB1Dr1YMcAIWcy/2+jJn+suPyiQjz6vgt476P9a/I7SUCta -P5QUPxvS9pZxFVTFKzpmdKxG1pbCAkhArtNg2R1VFEiYCxS+iey+F11pMPEZFVpC -EIXeVDQeBm9UXjrOpcTRIwEO7Q2J2lzRrhGm6Rpb6XbdmtQ3S8XgVsXYwWoV7muf -TE/d5fgtz8Hghti8w86FP9q61iH6AHCREwbHEUyat5hwznmbiNJHyjx+otI63sQo -FS37EazhqCEvt9jyvVSmB7kVTOLnIVATWDaUlPCLLvps09eRsz6aAa7RHCGd3x/W -mRHxDCbeKL4ilpo/FPZhANdQImLmFovOtwZ6xawRWKPcRXhkaL24qQC0MLH9wmnY -oM6EMioWUa0F11iFM99DTK+NF2Pk8vHNzm0Ep5g0SHzqnAIDDzeNTC9ogwsETqL5 -t7VY1GXuKWgta9L2q03X7FMEgjIc3lPgVLc0Ccx11MTgVzcIaLxFQ58oo+xFuc9I -rBqjZgJwg5MTdZiyZesLJuV+YP+yRat3LifAwIZhloSBVPU6YKx/y30BHjDM8FP1 -OM2IzJLrafZDy034XyD4s62YsKrHMcQ3CeoQ80QjvSyWvSlvn2vEqrbWIZADi0d/ -8vgl44gF9g9yN++G6S7BsTJ5PNgv0jrRFu/RpEN1hVOuo+nBqFsvxW8CAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/hosts/denahnu_tyil_net b/playbooks.d/vpn-tinc/share/hosts/denahnu_tyil_net deleted file mode 100644 index acc2038..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/denahnu_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Address = 81.2.254.110 -Subnet = 10.57.20.4/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEApFXqCta82BLknLg9jI4ZLmjROl9S9worvIo4hQeDFtZrKlelfx8f -RwfT9xF4YwI688FAlmZcGc1iRUTuCt+Pfbc+Lws6Kw1U/QIqAnga80chLzOkwPxV -idZyMPpZ0nWc/XCj63znozr6KGPVgibNKB3p/qGI7f00CVWJHlff7knAmCiShxyK -z+d7WglolSv7H7QE0Qz5tyMq7zkeide2MINd8Es+UpM4RpJHNIjFZmXm+lmfk/mW -fYYIi0z7dbOv+9fKdgljyAahL+sKIH1lfVTIaywY50eq7rAuG0UrA6/HXrNS9Hs2 -LNPfUcDVQLwqM+ZTCbVykQ29/EyU28RRwDM/L85NY6YFSvCv35lqaeo+PokTFMI4 -Dzro+IyEI4VvCQ4CeA8085HVTErnVMCRI4hwooyuBBmiKVB62KfHDD6D5J49dg8A -NzSkjmx1tqF+B8bOpk+gHJsk2ZXc1oU44S+1ydG7SdbqF2KWufpr9DIVIkTL64Cl -9ymrmdW86NYTpsvUJVdqw+RW+hE55vUPr+/0mMkNVFdWy56EICxKqhW+wN80CxNE -raiNuFWqKPxw3yrAomsgPIuH/a3bmqsTzHb5Rmkw5nArWqSENagF5tVFSBUcZkWb -6wwu/ourq6q1HXwP3Z9/03quelwKqmjPxwUCkl7CYeo8um1tjANeZvUCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/hosts/edephas_tyil_net b/playbooks.d/vpn-tinc/share/hosts/edephas_tyil_net deleted file mode 100644 index 6e095bb..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/edephas_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Subnet = 10.57.100.7/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEApxmzAXv4Mch5FP5AxHmpvHjkJGxcegbFzdFzHjhdLDJ9MQQZdM1p -PomhyYXB9Gsq4oJIOcjqJJdbp4dchYGJ++eS3V1wwstLMTl/+kWZ4ojI9sb/J5rl -a3gknTjipdUuoOpdkAkXKCbq9AXyFsvLr4Q6WaFpeTuIjNb2QgPOLUmcD1eNCdnn -KcHQAGR3zRh3uu8zMkaJZwQDZAdRLV6b77OLe7PXCsYgQ68qw3uti3JENv8VC80T -UxUmv8He7xgAqRCJbD3FH3WT2O63mK9jpnFj/BKDTm5k4hUDtZRY1O92JUqQAruw -gq3I8mhSqFMkvt+S67u950hRzN4/ZGs7lzxRkDqDqLy+ZISN2cDpbX1i4WmZFfex -zj7ZbmfsVzwSF/+K31AOQrODt79bGGFwjZgAVn9Cny/bysBxrOJy39D2Awioynpc -mjICtRP7utpo959YmSNsEcjfamIHVfUOTsEoIYhYASmWRjrSF6v7j2bbC+aFOWsf -yIRZc0EtH803/Ks++ieIDWFmhB0ydtkqFm8HK2eyqOqnlHTepmrDflkxfao3JTXP -CbldDpUGKBcLZ5FNaJ5hlQHnJGzU+wbnc133cdYtg9vvhFVgameme8ElcOjZZxMJ -fPWXMAWc2Szx3Hs/jlaTSIH2GoX1Rr2HdrrNg0qOG/qhLPNrtmrxH/sCAwEAAQ== ------END RSA PUBLIC KEY----- -Ed25519PublicKey = 4ABczlbBBLs5WMztIzafWw1ozwKZVkj4/of3Jc6awiO diff --git a/playbooks.d/vpn-tinc/share/hosts/faiwoo_tyil_net b/playbooks.d/vpn-tinc/share/hosts/faiwoo_tyil_net deleted file mode 100644 index f5eb8f3..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/faiwoo_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Address = 65.21.5.254 -Subnet = 10.57.20.5/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA3nBf2UWehfNWNrR6i4HJp64aPYI5SpV/7LplRwqXcmnJuHmQJ8Ht -Tozv5RHGGUNoSigbDxJSe16RQ0ESAzGNPSUEV6kntySXLvHSYb+SdjFm2wRpL8FI -8t69ZnRF0x+4ZShfa0rgco8sDdkhuPMNrPu8U6bMs+o4Lh8sVTRhDThv2+VfQkxG -T4G9kgdsxP0yi8sq1uflSYY3mYlVl9OPZwSO+vcVO9JFPvkVYFrqDHtvFGFqziQ/ -KvKcjwDTjpNVkFfJD6SIheeVrhysGk8qQIVMYc8yW9I8HGD7uP1BccZ0C/+b310i -y3qkNz/qqtgy0AxrrzbmFsVDgVyiPlwsD2SL+C4m6uEvB0FvYeL2/7vL8fI4RqcJ -ORAcA5G4FgzZRgHdZoZ1W4OB6eUCV4g9l425qbP3VVngJjX9PjPA/puz0i1IB0ZW -6ijGccgYtyj5+ibt3if0+inepT2BJba7pyQ4A92ogfsQKlSg1x27CfvsGKuMZjdo -y/akxYPEqKHQK37smpjcQTLVmLTTbGnf30ObTNW5LOJUmBue9B4fqBA/NV4fM1Gj -Omw/lazjwrJuenwEeGegRQhvjKlBLdjOnzsLoVrCCIe90KK/+RVSC0Mi2D0dzEPE -BNSbD4EJYs+6dJVT7+sneS8iwg9kG9wZ+UjeO4vraEjMrKj9BaKiJ1cCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/hosts/gaeru_tyil_net b/playbooks.d/vpn-tinc/share/hosts/gaeru_tyil_net deleted file mode 100644 index eba305b..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/gaeru_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Address = 37.48.120.26 -Subnet = 10.57.20.6/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA9NUrWO0L8lqrfs4BgZsLdfJZPfKx+Fi8P4k79CIBuVfkQ4OzJmoV -ahupoOo5edjYLJK09epa9zFRc1DuaotYC7Wm9DdIF82WNZXN9x/Mvuq06WaKXBdj -iTJKbYfVN/yv8Xfjzfp4DH3txwsq+9AuICHJkHOmb0lsDinpfbmP8C8ozBnutrLM -XGaIzXzkV2NbunyjaiR7dho5+4P6wedck+IV63KRzepbX36OW9xImmEEpBPeMPzd -VOgWs35FIgnE5uumXXfIax9CA9wFahvMYUlQbxA6kCg9PTteM3C44udFx8DxzGcR -giKEbfxjcZ4pK9JG+LTxNZC2BK1gsUNw8sX6mEEY496cs0T10RWzRZM/HvMIpj1W -5i72yh6kc8ieSr9hGIkm/oM/gwrFeC11PZQKis1P/0O5j7Lv6S7u6Edrpy/+WziV -Yk10eZXzHcFuVAh9+wQUeD3v4bMQA/mE8RPI9JX4Xkpbu1LOhtglEwFU1CWlG179 -B990cfr3cjJkTqS7qEfWuNh2lQd4iwpgqyPZB7Dd7tHT5EKEZSZ+4+w9Xo8xfy0v -7pdfImVHZ1PGVEsRk6AZZqcVcCRrjbKfqqL0m9JmB8vV5L3oZL/mXhFkh52aRMeZ -tzODNlBH0LW2TVVrBw3DJxFyRCRYjk4At8jagVe9fYM4ERkTQxqCFi0CAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/hosts/hurzak_tyil_net b/playbooks.d/vpn-tinc/share/hosts/hurzak_tyil_net deleted file mode 100644 index d55cf55..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/hurzak_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Address = 178.162.131.11 -Subnet = 10.57.20.7/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAmL0UOj+pMAV7R1Lq0rj3D+oGRnp5fz1q+jtbK3janX7gz0lFcXA8 -k6nOAzwksihQ9QfPLa0NEFpZ8PbLZP1mTFCf4f+1RWy9S2o4hLEzi+Ka8h/X54oH -jOcEZQd7hGpwDGvU/lTG+1Iofh4NAsuiKIS/pT58fZ8WIGDIbL5PHYGas44MEJX6 -BXn9CJx8kzktFGJ27isCrl93kueSqp9ajNCCsmoisJxxdyxG8L+iWktuusTOoi31 -IhmKqhA9wf87p5bYJ7Ae1079OXT7RxjExG+z2C9s6UouxDEmI2oXtmn5luRQkikw -T/nV29NJoUETcgVgrW3LHKr25cbXoaeosIgRsD6bLs0plOzECNrpl+/7ZKhr86M0 -ZynJyfoAWFVKaCHSqD9Js5HH13U7oOpTPMIZgZO0CwtESeUE1z7j4xNPMF8x9Ajg -E7zny0SVO5JJNPqy6WFa1s5fWjU4YlFZKPG2jpIBqgw/unOCywQlQlrJH26Oo8RF -5l9ccLmdQY2HWIpeY/BCEBCAZnsEt1/dV82HvgDeULXDyUOmpPgaNzCH445lzsg6 -xKtAyWt32VWS9x/OdAflmeHvKk+GM7g0X7g7IxCzkLRMYSn3M87IBKQ/cjE7yg50 -CbaLBdiDc3tVmR90fRalt/7PCccPychrFRFzE7E1/RIJKzqh6JTHUVkCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/hosts/ivdea_tyil_net b/playbooks.d/vpn-tinc/share/hosts/ivdea_tyil_net deleted file mode 100644 index 17f8c89..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/ivdea_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Subnet = 10.57.100.8/32 - - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA1cPD37/K8EHfro9L/qmEGcG7Ivu6Lvc9K9ry2f6YAjvLQHAwFrf3 -WXOHwg+x6aaE8Us7f2gHs8tU4NMNz4ggSIOesDOSUrVPOrrvZJnDaPzl8+bIOCrq -WOlgmo3RJv4w9G0QGmE7QGK2nX/gA05zaAMDP7Jd+yh7ohtYosth3/j/hetRdLD4 -j6D9tuwGKoQND3rlc7P4QV9bMM1wvKw63hj08YowBzD5GkYN+J833ZN2wmRqAvLp -cRnELg/UqSp0wu0l5VJImi8oz59zGzWPzxFBakemjCkM7xVe5LKK3ZkjwojWDTqG -BQXnhInrFplDm6j+A+jM1iOLwhwg1LbWthhzvrvZd68Dl3oBAsmRM8YmY7RjDpNW -nhqPWen5fum9kURwczY9GLj5GcRkBjEXVTU3KTpYKXeTZrRc3HT69WbbzdfXNKYj -aKRdL/OJZG4hNZFRgPHJP1svNrf4DLZiWIoAjeAdgXcHih1cUi2rP530YvRaajwT -FFDgcfRdWp00WQUkJ8Fcl//rynnZWjHSi4NXTsB7qVvdFClNqglxVewzBgBkriEO -n7SIXz6iNTaKLD63YaUY4oiqg4yY12P6ggY6U2atcXmK1g9syaYTIVD6MAA7XDxY -uI88cs2AZnjLsfpW4p7TD90r1qRZjbkguLhy71cEaIZMbH+H/8eAyD0CAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/hosts/jaomox_tyil_net b/playbooks.d/vpn-tinc/share/hosts/jaomox_tyil_net deleted file mode 100644 index c1b7faa..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/jaomox_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Address = 163.172.218.246 -Subnet = 10.57.21.1/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA1hTIMQha2vUVy0c8Ci5jF06T62IDDj9FhBtDBKOsvlZ1Lzh9OsqH -x7blL0WNBDoqmgyX0RdDwUIqnMOttMFK4y6ARY50Yw+s8m2uy3i9FgRUn2Y+Qjc8 -SmFh1fKt9yThKfBFDhUmTW0vjXlWR3jf77QB1PAJzk8wRmDx0GbBzcrsRMBrKc9a -rUN5mXz96xjkzq4vsAQ8W8aa4OmTR+oZcSe5iGzksXoh5BxmV8WjHK5ZpjuNi6qt -t1pWWanq3DG44/5pfvobULDh2Z1b8dV4oTGZW9CFFHmjOve5f+AQuy6nnFX9FH6R -dQ41GRCt3FFGMiCmej1BErPW2dE53A618vmcdd0J5Tt41TXX3oJo+gw3F1R5pNV7 -rd6hg634Iyx5y3JIJh9gQXbygCAnq32vtI6/j60MyGHk2Iu6KjfhtN56X/PRnJxa -G2swLdJtUi11WgEhEdBd2x3l3P46eVj4YS48d3J++9mFKZ+ejoKosc7u5Xaj055I -q0fQudOZswD4i8JT5cn7VFYAZSM+Po9Yxq9tfaIm5jld4f/XJGYL39lXBrUTFBWh -PFXDrb35MstSVgHWlKtsLJj+Por4K5NxHdUHRIsOaMGem5GgOYos0AvkLYiQngey -noZ41YSSyJwitHefW46+PKmx5MVlcMcwDOSpvZImTphnlKEttg9/RwMCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/hosts/krohxe_tyil_net b/playbooks.d/vpn-tinc/share/hosts/krohxe_tyil_net deleted file mode 100644 index 0655f39..0000000 --- a/playbooks.d/vpn-tinc/share/hosts/krohxe_tyil_net +++ /dev/null @@ -1,16 +0,0 @@ -Subnet = 10.57.20.8/32 - - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA0kL+MH9xOLAKrwUF17a642QLnU+72xbxiFtbWFXGIj17hlcqiOAv -NqWFO1EzroRgaNzqdufMik7G7MFzrGG+7/fziC5Vj7A7UMi+8F8ig1tKLpqe0/+f -DqQfbU0tPaPPPc95lEYOU4j50ALBNAZLNaP5a0BIN7N+Bj0JQNTah1u45mdIMQh2 -LpIkbe5MWaVcVvh61l5mxM/+rsU8lJE4+SmOuFJZ+7bzsbtQf5mPc4kF8aqPoMle -XuizHguphe3CrZgOvvmAVvrV9O7FvpFHlJcmt4FkyEZ0e8l0h9/YKHx94py4STa2 -O3zFJFHf4zVAIzSx+1mVV08aulcIGjTpHLSIlAuQ1kqEI8lGfcCawyMCPdcRzWKJ -eo7fo8/slzg9O/Id/uZwlDltnBXI4053bhjsglEfm/zZHog00IR/rSXuiqJLV+Th -8uNRGXezB/frVn58w8dbOuPDzsVTLNeDeZJHrKRxTn/bwVFLrG25ow9qMgr/mqaP -sA6PjBnw01SkBUJY6fmowip9YcQTOjlauUR6w/F70aOIqT65M1ralSVmWAUFCKRz -KYOaOPHfpQQVxQaDnUKPiDyF8YoP9zoocyh5BnBEKP6ctYZkZd3i5naJ1SG16R5j -U9iMnzo/uKG1CAP7jnM7IGZ6XhlHchst5LxVAm2cGT8apEWJOvFnqOMCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/playbooks.d/vpn-tinc/share/tinc-up-ifconfig b/playbooks.d/vpn-tinc/share/tinc-up-ifconfig index 66c897e..6f040d1 100644 --- a/playbooks.d/vpn-tinc/share/tinc-up-ifconfig +++ b/playbooks.d/vpn-tinc/share/tinc-up-ifconfig @@ -1,3 +1,4 @@ #!/bin/sh ifconfig "$INTERFACE" inet ${ip4} netmask 255.255.0.0 +ifconfig "$INTERFACE" inet ${ip6} netmask 255.255.0.0 diff --git a/playbooks.d/vpn-tinc/share/tinc-up-ip b/playbooks.d/vpn-tinc/share/tinc-up-ip index 191d310..105d8a5 100644 --- a/playbooks.d/vpn-tinc/share/tinc-up-ip +++ b/playbooks.d/vpn-tinc/share/tinc-up-ip @@ -1,5 +1,6 @@ #!/bin/sh ip -4 addr add "${ip4}/16" dev "$INTERFACE" +ip -6 addr add "${ip6}/64" dev "$INTERFACE" ip link set "$INTERFACE" up diff --git a/playbooks.d/vpn-tinc/share/tinc.conf b/playbooks.d/vpn-tinc/share/tinc.conf index 89ccdfd..11696a7 100644 --- a/playbooks.d/vpn-tinc/share/tinc.conf +++ b/playbooks.d/vpn-tinc/share/tinc.conf @@ -1,7 +1,10 @@ Name = ${name} ConnectTo = caeghi_tyil_net -ConnectTo = denahnu_tyil_net +ConnectTo = faiwoo_tyil_net ConnectTo = gaeru_tyil_net -ConnectTo = hurzak_tyil_net ConnectTo = jaomox_tyil_net +ConnectTo = mieshu_tyil_net +ConnectTo = nouki_tyil_net +ConnectTo = oolah_tyil_net +ConnectTo = qohrei_tyil_net |