From caacb543402da7a5c642b7baebdbf8afbaede25c Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Wed, 28 Feb 2024 11:00:02 +0100 Subject: Update VPN IPs --- data.d/vpn-tinc/hosts/anoia_tyil_net | 1 + data.d/vpn-tinc/hosts/caeghi_tyil_net | 2 ++ data.d/vpn-tinc/hosts/edephas_tyil_net | 1 + data.d/vpn-tinc/hosts/faiwoo_tyil_net | 2 ++ data.d/vpn-tinc/hosts/gaeru_tyil_net | 1 + data.d/vpn-tinc/hosts/jaomox_tyil_net | 3 ++- data.d/vpn-tinc/hosts/ludifah_tyil_net | 2 +- data.d/vpn-tinc/hosts/mieshu_tyil_net | 2 ++ data.d/vpn-tinc/hosts/nouki_tyil_net | 2 ++ data.d/vpn-tinc/hosts/oolah_tyil_net | 3 ++- data.d/vpn-tinc/hosts/plarabe_tyil_net | 2 +- data.d/vpn-tinc/hosts/qohrei_tyil_net | 4 +++- data.d/vpn-wireguard/peers/caeghi.tyil.net | 2 +- data.d/vpn-wireguard/peers/oolah.tyil.net | 2 +- data.d/vpn-wireguard/peers/qohrei.tyil.net | 2 +- hosts.d/anoia.tyil.net | 1 + hosts.d/caeghi.tyil.net | 3 ++- hosts.d/edephas.tyil.net | 1 + hosts.d/faiwoo.tyil.net | 3 ++- hosts.d/gaeru.tyil.net | 1 + hosts.d/jaomox.tyil.net | 3 +++ hosts.d/ludifah.tyil.net | 1 + hosts.d/mieshu.tyil.net | 3 ++- hosts.d/nouki.tyil.net | 3 +++ hosts.d/oolah.tyil.net | 3 ++- hosts.d/plarabe.tyil.net | 1 + hosts.d/qohrei.tyil.net | 4 +++- 27 files changed, 45 insertions(+), 13 deletions(-) diff --git a/data.d/vpn-tinc/hosts/anoia_tyil_net b/data.d/vpn-tinc/hosts/anoia_tyil_net index 77eadbf..ff46bf7 100644 --- a/data.d/vpn-tinc/hosts/anoia_tyil_net +++ b/data.d/vpn-tinc/hosts/anoia_tyil_net @@ -1,4 +1,5 @@ Subnet = 10.57.100.3/32 +Subnet = fd68:1057:1992:3381:0:3317:0:2/128 Ed25519PublicKey = 04G6200IYDzDT3H0Yj6ZjQUIUc8tCIvzPaXmyk36e2M -----BEGIN RSA PUBLIC KEY----- diff --git a/data.d/vpn-tinc/hosts/caeghi_tyil_net b/data.d/vpn-tinc/hosts/caeghi_tyil_net index c5d5b05..7816713 100644 --- a/data.d/vpn-tinc/hosts/caeghi_tyil_net +++ b/data.d/vpn-tinc/hosts/caeghi_tyil_net @@ -1,5 +1,7 @@ Address = 116.202.102.33 +Address = 2a01:4f8:c010:ca5::1 Subnet = 10.57.20.2/32 +Subnet = fd68:1057:1992:3381:0:1:0:1 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA2abFKFB1Dr1YMcAIWcy/2+jJn+suPyiQjz6vgt476P9a/I7SUCta diff --git a/data.d/vpn-tinc/hosts/edephas_tyil_net b/data.d/vpn-tinc/hosts/edephas_tyil_net index 6e095bb..e0e2f3b 100644 --- a/data.d/vpn-tinc/hosts/edephas_tyil_net +++ b/data.d/vpn-tinc/hosts/edephas_tyil_net @@ -1,4 +1,5 @@ Subnet = 10.57.100.7/32 +Subnet = fd68:1057:1992:3381:0:3317:0:1/128 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEApxmzAXv4Mch5FP5AxHmpvHjkJGxcegbFzdFzHjhdLDJ9MQQZdM1p diff --git a/data.d/vpn-tinc/hosts/faiwoo_tyil_net b/data.d/vpn-tinc/hosts/faiwoo_tyil_net index f5eb8f3..1a7aeac 100644 --- a/data.d/vpn-tinc/hosts/faiwoo_tyil_net +++ b/data.d/vpn-tinc/hosts/faiwoo_tyil_net @@ -1,5 +1,7 @@ Address = 65.21.5.254 +Address = 2a01:4f9:c010:e20c::1 Subnet = 10.57.20.5/32 +Subnet = fd68:1057:1992:3381:0:1:1:2 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA3nBf2UWehfNWNrR6i4HJp64aPYI5SpV/7LplRwqXcmnJuHmQJ8Ht diff --git a/data.d/vpn-tinc/hosts/gaeru_tyil_net b/data.d/vpn-tinc/hosts/gaeru_tyil_net index d7a3c0b..d947b01 100644 --- a/data.d/vpn-tinc/hosts/gaeru_tyil_net +++ b/data.d/vpn-tinc/hosts/gaeru_tyil_net @@ -1,5 +1,6 @@ Address = 37.48.120.26 Subnet = 10.57.20.6/32 +Subnet = fd68:1057:1992:3381:0:2:0:1 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAvoIVYdxmypwYxZh89WAQDjpNWs8TDhn/mQVRy+WPqT39HCkHhOab diff --git a/data.d/vpn-tinc/hosts/jaomox_tyil_net b/data.d/vpn-tinc/hosts/jaomox_tyil_net index afafdd4..c440db1 100644 --- a/data.d/vpn-tinc/hosts/jaomox_tyil_net +++ b/data.d/vpn-tinc/hosts/jaomox_tyil_net @@ -1,5 +1,6 @@ +Address = 163.172.218.246 Subnet = 10.57.21.1/32 - +Subnet = fd68:1057:1992:3381:0:3:3:1 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAuIBWktCuiEBGV0xDHqXXyUNXjfKf4WWKjCYmA3eFbVMEDinoZef3 diff --git a/data.d/vpn-tinc/hosts/ludifah_tyil_net b/data.d/vpn-tinc/hosts/ludifah_tyil_net index 6796f17..c236163 100644 --- a/data.d/vpn-tinc/hosts/ludifah_tyil_net +++ b/data.d/vpn-tinc/hosts/ludifah_tyil_net @@ -1,5 +1,5 @@ Subnet = 10.57.100.9/32 - +Subnet = fd68:1057:1992:3381:0:3317:0:4/128 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA2pXuIIPoQhWLzTSsO0bvgkQ1+7RgqPVv8b6zNfmRUfj2uKy3OZEn diff --git a/data.d/vpn-tinc/hosts/mieshu_tyil_net b/data.d/vpn-tinc/hosts/mieshu_tyil_net index 3165294..7e3c050 100644 --- a/data.d/vpn-tinc/hosts/mieshu_tyil_net +++ b/data.d/vpn-tinc/hosts/mieshu_tyil_net @@ -1,4 +1,6 @@ +Address = 2a10:3781:2453:1:4950:47ce:f8db:1fed Subnet = 10.57.101.10/32 +Subnet = fd68:1057:1992:3381:0:3317:3:1/128 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAtanpLzqjn0nFSeGBxJvVlTsmkXLkXa5QZZkXg4P6xGcXkIq38DV5 diff --git a/data.d/vpn-tinc/hosts/nouki_tyil_net b/data.d/vpn-tinc/hosts/nouki_tyil_net index e479041..1232c0e 100644 --- a/data.d/vpn-tinc/hosts/nouki_tyil_net +++ b/data.d/vpn-tinc/hosts/nouki_tyil_net @@ -1,4 +1,6 @@ +Address = 2a10:3781:2453:1:b4e0:9393:3c64:7fd8 Subnet = 10.57.101.20/32 +Subnet = fd68:1057:1992:3381:0:3317:2:1/128 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAvBBrlZ9vU+LiW30AWQAMfJDMH4IJcr3CuQNWqnYs7xRKtAE3Rqnc diff --git a/data.d/vpn-tinc/hosts/oolah_tyil_net b/data.d/vpn-tinc/hosts/oolah_tyil_net index 01278fd..e5d0e66 100644 --- a/data.d/vpn-tinc/hosts/oolah_tyil_net +++ b/data.d/vpn-tinc/hosts/oolah_tyil_net @@ -1,5 +1,6 @@ +Address = 2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8 Subnet = 10.57.101.1/32 - +Subnet = fd68:1057:1992:3381:0:3317:1:1/128 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA3uaxPI2q7VPAVOh4D9u8b6kSFXNMLtvJQozlhH/Hr3+5Cv/wfKlB diff --git a/data.d/vpn-tinc/hosts/plarabe_tyil_net b/data.d/vpn-tinc/hosts/plarabe_tyil_net index c375b95..0d2a970 100644 --- a/data.d/vpn-tinc/hosts/plarabe_tyil_net +++ b/data.d/vpn-tinc/hosts/plarabe_tyil_net @@ -1,5 +1,5 @@ Subnet = 10.57.100.10/32 - +Subnet = fd68:1057:1992:3381:0:3317:0:3 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAvply9cPmEi7zqZEqIEYpTisk+OJvIOXhEL1uwz3ntf8z/1CjG7bq diff --git a/data.d/vpn-tinc/hosts/qohrei_tyil_net b/data.d/vpn-tinc/hosts/qohrei_tyil_net index aaf73ea..f38fc9c 100644 --- a/data.d/vpn-tinc/hosts/qohrei_tyil_net +++ b/data.d/vpn-tinc/hosts/qohrei_tyil_net @@ -1,5 +1,7 @@ +Address = 37.27.37.131 +Address = 2a01:4f9:c012:6273::1 Subnet = 10.57.250.250/32 - +Subnet = fd68:1057:1992:3381:0:1:1:1 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA3xeAUoTfq/aF4/y9+O8gmYM733srXyqtXuA7HKfeDOsmGO1myVOo diff --git a/data.d/vpn-wireguard/peers/caeghi.tyil.net b/data.d/vpn-wireguard/peers/caeghi.tyil.net index dd4447e..4a8fcc5 100644 --- a/data.d/vpn-wireguard/peers/caeghi.tyil.net +++ b/data.d/vpn-wireguard/peers/caeghi.tyil.net @@ -1,4 +1,4 @@ [Peer] -AllowedIPs = fd68:1057:1992:3381:0:1:0:2/128 +AllowedIPs = fd68:1058:1992:3381:0:1:0:2/128 Endpoint = [2a01:4f8:c010:ca5::1]:51820 PublicKey = vGpzh18/52wjBrXRD/a+MD7MJ01ciWblxXR4FyCDcxA= diff --git a/data.d/vpn-wireguard/peers/oolah.tyil.net b/data.d/vpn-wireguard/peers/oolah.tyil.net index cfc6043..7a19559 100644 --- a/data.d/vpn-wireguard/peers/oolah.tyil.net +++ b/data.d/vpn-wireguard/peers/oolah.tyil.net @@ -1,4 +1,4 @@ [Peer] -AllowedIPs = fd68:1057:1992:3381:0:3317:0:1/128 +AllowedIPs = fd68:1058:1992:3381:0:3317:0:1/128 Endpoint = [2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8]:51820 PublicKey = Mk+SQeYfV25BSxtynJA96aHTYGGMCfFvw5al70noX2c= diff --git a/data.d/vpn-wireguard/peers/qohrei.tyil.net b/data.d/vpn-wireguard/peers/qohrei.tyil.net index 63058aa..3faf0d6 100644 --- a/data.d/vpn-wireguard/peers/qohrei.tyil.net +++ b/data.d/vpn-wireguard/peers/qohrei.tyil.net @@ -1,4 +1,4 @@ [Peer] -AllowedIPs = fd68:1057:1992:3381:0:1:0:1 +AllowedIPs = fd68:1058:1992:3381:0:1:0:1 Endpoint = [2a01:4f9:c012:6273::1]:51820 PublicKey = 944GFpkZnrVRziBBR1ST52PDwuFjW/XfXwggmLH46E8= diff --git a/hosts.d/anoia.tyil.net b/hosts.d/anoia.tyil.net index b7ef889..40e23e4 100644 --- a/hosts.d/anoia.tyil.net +++ b/hosts.d/anoia.tyil.net @@ -4,3 +4,4 @@ bashtard.backup.repositories.1=rsync.net:{fqdn} bashtard.ssh.host=10.57.100.3 meta.provider=self vpn-tinc.ipv4=10.57.100.3 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:0:2 diff --git a/hosts.d/caeghi.tyil.net b/hosts.d/caeghi.tyil.net index b1c589d..67da46a 100644 --- a/hosts.d/caeghi.tyil.net +++ b/hosts.d/caeghi.tyil.net @@ -6,5 +6,6 @@ bashtard.backup.repositories.1=rsync.net:{fqdn} bashtard.ssh.host=10.57.20.2 meta.provider=hetzner vpn-tinc.ipv4=10.57.20.2 -vpn-wireguard.ip=fd68:1057:1992:3381:0:1:0:2 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:0:1 +vpn-wireguard.ip=fd68:1058:1992:3381:0:1:0:1 vpn-wireguard.endpoint=2a01:4f8:c010:ca5::1 diff --git a/hosts.d/edephas.tyil.net b/hosts.d/edephas.tyil.net index 38f39c8..75197a4 100644 --- a/hosts.d/edephas.tyil.net +++ b/hosts.d/edephas.tyil.net @@ -9,3 +9,4 @@ bashtard.backup.repositories.rsync=rsync.net:{fqdn} bashtard.ssh.host=10.57.100.7 meta.provider=self vpn-tinc.ipv4=10.57.100.7 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:0:1 diff --git a/hosts.d/faiwoo.tyil.net b/hosts.d/faiwoo.tyil.net index 0434b06..db2c162 100644 --- a/hosts.d/faiwoo.tyil.net +++ b/hosts.d/faiwoo.tyil.net @@ -6,5 +6,6 @@ bashtard.backup.repositories.1=rsync.net:{fqdn} bashtard.ssh.host=10.57.20.5 meta.provider=hetzner vpn-tinc.ipv4=10.57.20.5 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:2 vpn-wireguard.endpoint=2a01:4f9:c010:e20c::1 -vpn-wireguard.ip=fd68:1e45:bc6c:4c7b::57:20:5 +vpn-wireguard.ip=fd68:1058:1992:3381:0:1:1:2 diff --git a/hosts.d/gaeru.tyil.net b/hosts.d/gaeru.tyil.net index 9adeaa0..e3fc506 100644 --- a/hosts.d/gaeru.tyil.net +++ b/hosts.d/gaeru.tyil.net @@ -5,3 +5,4 @@ bashtard.backup.repositories.1=rsync.net:{fqdn} bashtard.ssh.host=10.57.20.6 meta.provider=leaseweb vpn-tinc.ipv4=10.57.20.6 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:2:0:1 diff --git a/hosts.d/jaomox.tyil.net b/hosts.d/jaomox.tyil.net index e0c9b5a..b525946 100644 --- a/hosts.d/jaomox.tyil.net +++ b/hosts.d/jaomox.tyil.net @@ -5,3 +5,6 @@ bashtard.backup.repositories.1=rsync.net:{fqdn} bashtard.ssh.host=10.57.21.1 meta.provider=oneprovider vpn-tinc.ipv4=10.57.21.1 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3:3:1 +vpn-wireguard.ip=fd68:1058:1992:3381:0:3:3:1 +vpn-wireguard.endpoint=163.172.218.246 diff --git a/hosts.d/ludifah.tyil.net b/hosts.d/ludifah.tyil.net index 09605f0..810bf8d 100644 --- a/hosts.d/ludifah.tyil.net +++ b/hosts.d/ludifah.tyil.net @@ -5,3 +5,4 @@ bashtard.backup.repositories.1=rsync.net:{fqdn} bashtard.ssh.host=10.57.100.9 meta.provider=self vpn-tinc.ipv4=10.57.100.9 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:0:4 diff --git a/hosts.d/mieshu.tyil.net b/hosts.d/mieshu.tyil.net index d3874ef..3e2a0fa 100644 --- a/hosts.d/mieshu.tyil.net +++ b/hosts.d/mieshu.tyil.net @@ -30,6 +30,7 @@ meta.provider=self nfs-server.exports./mnt/exports/invidious.fsid=97d3493c-1397-479f-bb8a-5c71833b9e17 nfs-server.exports./mnt/exports/prometheus.fsid=052f42b5-33c0-40b9-aa69-d05dc03a9fa1 vpn-tinc.ipv4=10.57.101.10 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:3:1 vpn-wireguard.endpoint=2a10:3781:2453:1:4950:47ce:f8db:1fed -vpn-wireguard.ip=fd68:1e45:bc6c:4c7b::57:101:10 +vpn-wireguard.ip=fd68:1058:1992:3381:0:3317:3:1 vpn-wireguard.port=51820 diff --git a/hosts.d/nouki.tyil.net b/hosts.d/nouki.tyil.net index 049d795..1fa986e 100644 --- a/hosts.d/nouki.tyil.net +++ b/hosts.d/nouki.tyil.net @@ -2,3 +2,6 @@ bashtard.ssh.host=10.57.101.20 k3s-node.role=server meta.provider=self vpn-tinc.ipv4=10.57.101.20 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:2:1 +vpn-wireguard.ip=fd68:1058:1992:3381:0:3317:2:1 +vpn-wireguard.endpoint=2a10:3781:2453:1:b4e0:9393:3c64:7fd8 diff --git a/hosts.d/oolah.tyil.net b/hosts.d/oolah.tyil.net index d3b9a86..08874cf 100644 --- a/hosts.d/oolah.tyil.net +++ b/hosts.d/oolah.tyil.net @@ -4,5 +4,6 @@ k3s-node.role=server k3s-node.entry.host=10.57.101.20 meta.provider=self vpn-tinc.ipv4=10.57.101.1 -vpn-wireguard.ip=fd68:1057:1992:3381:0:3317:0:1 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:1:1 +vpn-wireguard.ip=fd68:1058:1992:3381:0:3317:1:1 vpn-wireguard.endpoint=2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8 diff --git a/hosts.d/plarabe.tyil.net b/hosts.d/plarabe.tyil.net index 0a8a289..8a8ef11 100644 --- a/hosts.d/plarabe.tyil.net +++ b/hosts.d/plarabe.tyil.net @@ -1,3 +1,4 @@ bashtard.ssh.host=10.57.100.10 meta.provider=self vpn-tinc.ipv4=10.57.100.10 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:0:3 diff --git a/hosts.d/qohrei.tyil.net b/hosts.d/qohrei.tyil.net index 169dec4..21e69df 100644 --- a/hosts.d/qohrei.tyil.net +++ b/hosts.d/qohrei.tyil.net @@ -1,3 +1,5 @@ +meta.provider=hetzner vpn-tinc.ipv4=10.57.250.250 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:1 vpn-wireguard.endpoint=2a01:4f9:c012:6273::1 -vpn-wireguard.ip=fd68:1057:1992:3381:0:1:0:1 +vpn-wireguard.ip=fd68:1058:1992:3381:0:1:1:1 -- cgit v1.1