From 1f5ecf09c71e8e1475e26a2eb7314a6ff8fa0be2 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Sat, 6 Apr 2024 08:45:00 +0200 Subject: Reorganize IP space in the VPNs --- hosts.d/anoia.tyil.net | 4 ++-- hosts.d/caeghi.tyil.net | 6 ++++-- hosts.d/edephas.tyil.net | 6 +++--- hosts.d/faiwoo.tyil.net | 8 ++++---- hosts.d/gaeru.tyil.net | 6 +++--- hosts.d/jaomox.tyil.net | 4 ++-- hosts.d/ludifah.tyil.net | 6 +++--- hosts.d/mieshu.tyil.net | 6 +++--- hosts.d/nouki.tyil.net | 2 +- hosts.d/oolah.tyil.net | 2 +- hosts.d/qohrei.tyil.net | 8 ++++---- hosts.d/ricui.tyil.net | 10 +++++----- 12 files changed, 35 insertions(+), 33 deletions(-) diff --git a/hosts.d/anoia.tyil.net b/hosts.d/anoia.tyil.net index 40e23e4..6a7b0d6 100644 --- a/hosts.d/anoia.tyil.net +++ b/hosts.d/anoia.tyil.net @@ -3,5 +3,5 @@ bashtard.backup.fs.paths.2=/home/tyil 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 +vpn-tinc.ipv4=10.57.0.4 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:4 diff --git a/hosts.d/caeghi.tyil.net b/hosts.d/caeghi.tyil.net index 35c70c3..efead9c 100644 --- a/hosts.d/caeghi.tyil.net +++ b/hosts.d/caeghi.tyil.net @@ -5,5 +5,7 @@ bashtard.backup.fs.paths.3=/var/lib/mumble-server 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-tinc.ipv6=fd68:1057:1992:3381:0:1:0:1 +vpn-tinc.ipv4=10.57.1.3 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:1 +vpn-wireguard.ipv4=10.58.1.3 +vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:1 diff --git a/hosts.d/edephas.tyil.net b/hosts.d/edephas.tyil.net index 75197a4..9638dd8 100644 --- a/hosts.d/edephas.tyil.net +++ b/hosts.d/edephas.tyil.net @@ -6,7 +6,7 @@ bashtard.backup.fs.paths.2=/home/tyil/.local/git bashtard.backup.fs.paths.3=/var/www/* bashtard.backup.repositories.edephas=/var/media/backups/{fqdn} bashtard.backup.repositories.rsync=rsync.net:{fqdn} -bashtard.ssh.host=10.57.100.7 +bashtard.ssh.host=10.57.0.7 meta.provider=self -vpn-tinc.ipv4=10.57.100.7 -vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:0:1 +vpn-tinc.ipv4=10.57.0.1 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:1 diff --git a/hosts.d/faiwoo.tyil.net b/hosts.d/faiwoo.tyil.net index 9a30bdc..b9f9fd1 100644 --- a/hosts.d/faiwoo.tyil.net +++ b/hosts.d/faiwoo.tyil.net @@ -1,13 +1,13 @@ -k3s-node.internal-ip=fd68:1058:1992:3381:0:1:1:2,10.58.1.2 +k3s-node.internal-ip=fd68:1057:1992:3381:0:1:1:2,10.57.1.4 bashtard.backup.borg.remote_paths.1=borg1 bashtard.backup.fs.paths.1=/home bashtard.backup.fs.paths.2=/var/www bashtard.backup.fs.paths.3=/etc bashtard.backup.repositories.1=rsync.net:{fqdn} -bashtard.ssh.host=10.57.20.5 +bashtard.ssh.host=10.57.1.4 meta.provider=hetzner -vpn-tinc.ipv4=10.57.20.5 +vpn-tinc.ipv4=10.57.1.4 vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:2 vpn-wireguard.endpoint=2a01:4f9:c010:e20c::1 -vpn-wireguard.ipv4=10.58.1.2 +vpn-wireguard.ipv4=10.58.1.4 vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:2 diff --git a/hosts.d/gaeru.tyil.net b/hosts.d/gaeru.tyil.net index 6d3b7cd..b1aadbe 100644 --- a/hosts.d/gaeru.tyil.net +++ b/hosts.d/gaeru.tyil.net @@ -2,10 +2,10 @@ bashtard.backup.borg.remote_paths.1=borg1 bashtard.backup.fs.paths.1=/etc bashtard.backup.fs.paths.2=/home bashtard.backup.repositories.1=rsync.net:{fqdn} -bashtard.ssh.host=10.57.20.6 +bashtard.ssh.host=10.57.1.2 meta.provider=leaseweb -vpn-tinc.ipv4=10.57.20.6 +vpn-tinc.ipv4=10.57.1.2 vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:2:1 vpn-wireguard.endpoint=37.48.120.26 -vpn-wireguard.ipv4=10.58.1.5 +vpn-wireguard.ipv4=10.58.1.2 vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:2:1 diff --git a/hosts.d/jaomox.tyil.net b/hosts.d/jaomox.tyil.net index 3aed991..9a52718 100644 --- a/hosts.d/jaomox.tyil.net +++ b/hosts.d/jaomox.tyil.net @@ -22,8 +22,8 @@ seaweedfs-volume.ip&=vpn-wireguard.ipv6 seaweedfs-volume.dc&=meta.provider seaweedfs-volume.rack=amsterdam seaweedfs-volume.volumes.0.port=8080 -vpn-tinc.ipv4=10.57.21.1 +vpn-tinc.ipv4=10.57.3.2 vpn-tinc.ipv6=fd68:1057:1992:3381:0:3:3:1 vpn-wireguard.endpoint=163.172.218.246 -vpn-wireguard.ipv4=10.58.3.1 +vpn-wireguard.ipv4=10.58.3.2 vpn-wireguard.ipv6=fd68:1058:1992:3381:0:3:3:1 diff --git a/hosts.d/ludifah.tyil.net b/hosts.d/ludifah.tyil.net index 810bf8d..abc3892 100644 --- a/hosts.d/ludifah.tyil.net +++ b/hosts.d/ludifah.tyil.net @@ -2,7 +2,7 @@ bashtard.backup.borg.remote_paths.1=borg1 bashtard.backup.fs.paths.1=/etc bashtard.backup.fs.paths.2=/home/tyil bashtard.backup.repositories.1=rsync.net:{fqdn} -bashtard.ssh.host=10.57.100.9 +bashtard.ssh.host=10.57.0.2 meta.provider=self -vpn-tinc.ipv4=10.57.100.9 -vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:0:4 +vpn-tinc.ipv4=10.57.0.2 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:2 diff --git a/hosts.d/mieshu.tyil.net b/hosts.d/mieshu.tyil.net index 383048d..b95a49b 100644 --- a/hosts.d/mieshu.tyil.net +++ b/hosts.d/mieshu.tyil.net @@ -40,8 +40,8 @@ seaweedfs-volume.volumes.tyilstore2.port.grpc=17082 seaweedfs-volume.volumes.tyilstore2.port.http=5082 seaweedfs-volume.volumes.tyilstore3.port.grpc=17083 seaweedfs-volume.volumes.tyilstore3.port.http=5083 -vpn-tinc.ipv4=10.57.101.10 +vpn-tinc.ipv4=10.57.3.1 vpn-tinc.ipv6=fd68:1057:1992:3381:0:3:3317:1 vpn-wireguard.endpoint=2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8 -vpn-wireguard.ipv4=10.58.3.2 -vpn-wireguard.ipv6=fd68:1058:1992:3381:0:3:3317:2 +vpn-wireguard.ipv4=10.58.3.1 +vpn-wireguard.ipv6=fd68:1058:1992:3381:0:3:3317:1 diff --git a/hosts.d/nouki.tyil.net b/hosts.d/nouki.tyil.net index 664c70c..7dbe4c6 100644 --- a/hosts.d/nouki.tyil.net +++ b/hosts.d/nouki.tyil.net @@ -1,7 +1,7 @@ bashtard.ssh.host=10.57.101.20 k3s-node.role=server meta.provider=self -vpn-tinc.ipv4=10.57.101.20 +vpn-tinc.ipv4=10.57.2.1 vpn-tinc.ipv6=fd68:1057:1992:3381:0:2:3317:1 vpn-wireguard.endpoint=2a10:3781:2453:1:c8cb:d1a:bc0:dc38 vpn-wireguard.ipv4=10.58.2.1 diff --git a/hosts.d/oolah.tyil.net b/hosts.d/oolah.tyil.net index 94501dd..ce5e47d 100644 --- a/hosts.d/oolah.tyil.net +++ b/hosts.d/oolah.tyil.net @@ -4,5 +4,5 @@ meta.provider=self vpn-tinc.ipv4=10.57.1.1 vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:3317:1 vpn-wireguard.endpoint=2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8 -vpn-wireguard.ipv4=10.58.1.4 +vpn-wireguard.ipv4=10.58.1.1 vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:3317:1 diff --git a/hosts.d/qohrei.tyil.net b/hosts.d/qohrei.tyil.net index c091df5..f206068 100644 --- a/hosts.d/qohrei.tyil.net +++ b/hosts.d/qohrei.tyil.net @@ -11,8 +11,8 @@ nftables.input.rules.kubeapi.proto=tcp nftables.input.rules.kubelet.policy=accept nftables.input.rules.kubelet.port=10250 nftables.input.rules.kubelet.proto=tcp -vpn-tinc.ipv4=10.57.250.250 -vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:1 +vpn-tinc.ipv4=10.57.1.6 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:3 vpn-wireguard.endpoint=2a01:4f9:c012:6273::1 -vpn-wireguard.ipv4=10.58.1.1 -vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:1 +vpn-wireguard.ipv4=10.58.1.6 +vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:3 diff --git a/hosts.d/ricui.tyil.net b/hosts.d/ricui.tyil.net index e77fb07..9c4c8b5 100644 --- a/hosts.d/ricui.tyil.net +++ b/hosts.d/ricui.tyil.net @@ -1,12 +1,12 @@ -k3s-node.internal-ip=fd68:1058:1992:3381:0:1:1:3,10.58.1.3 +k3s-node.internal-ip=fd68:1057:1992:3381:0:1:1:4,10.57.1.7 meta.provider=hetzner nftables.input.interfaces.cilium*.policy=accept nftables.input.interfaces.lxc*.policy=accept nftables.input.rules.kubelet.policy=accept nftables.input.rules.kubelet.port=10250 nftables.input.rules.kubelet.proto=tcp -vpn-tinc.ipv4=10.57.20.7 -vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:3 +vpn-tinc.ipv4=10.57.1.7 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:4 vpn-wireguard.endpoint=2a01:4f8:1c1b:67d7::1 -vpn-wireguard.ipv4=10.58.1.3 -vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:3 +vpn-wireguard.ipv4=10.58.1.7 +vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:4 -- cgit v1.1