From 2cc5ca5d60acf2f4a6ad87515d8fb4036ed5b13c Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 26 Nov 2022 16:25:25 +0100 Subject: [PATCH] dumpyourvms: update networking --- hosts/dumpyourvms/networking.nix | 59 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/hosts/dumpyourvms/networking.nix b/hosts/dumpyourvms/networking.nix index c9f7c316..70750ca5 100644 --- a/hosts/dumpyourvms/networking.nix +++ b/hosts/dumpyourvms/networking.nix @@ -3,74 +3,75 @@ #resolvconf.enable = true; hosts = { - "10.0.0.42" = [ "nomad.service.consul" "nomad.service.cgn-1.consul" ]; - "10.0.0.66" = [ "consul.service.cgn-1.consul" ]; - "10.0.1.9" = [ "consul.service.lev-1.consul" ]; - "10.0.0.70" = [ "vault.service.consul" "vault.service.cgn-1.consul" ]; - "10.0.0.200" = [ "headnode.cgn-1" ]; - "10.0.0.201" = [ "cn01.cgn-1" ]; - "10.0.0.202" = [ "cn02.cgn-1" ]; - "10.0.0.205" = [ "cn05.cgn-1" ]; - "10.0.0.206" = [ "cn06.cgn-1" ]; - "10.0.0.207" = [ "cn07.cgn-1" ]; - "10.0.0.208" = [ "cn08.cgn-1" ]; - "10.0.1.200" = [ "headnode.lev-1" ]; - "10.0.1.201" = [ "cn01.lev-1" ]; - "10.0.1.202" = [ "cn02.lev-1" ]; - "10.0.1.203" = [ "cn03.lev-1" ]; - "10.0.1.204" = [ "cn04.lev-1" ]; - "10.0.1.205" = [ "cn05.lev-1" ]; - "10.0.1.206" = [ "cn00.lev-1" ]; - "10.0.1.207" = [ "cn06.lev-1" ]; - "10.0.1.208" = [ "cn07.lev-1" ]; - "10.101.64.10" = [ "wifi.bahn.de" ]; + "10.0.0.42" = ["nomad.service.consul" "nomad.service.cgn-1.consul"]; + "10.0.0.66" = ["consul.service.cgn-1.consul"]; + "10.0.1.9" = ["consul.service.lev-1.consul"]; + "10.0.0.70" = ["vault.service.consul" "vault.service.cgn-1.consul"]; + "10.0.0.200" = ["headnode.cgn-1"]; + "10.0.0.201" = ["cn01.cgn-1"]; + "10.0.0.202" = ["cn02.cgn-1"]; + "10.0.0.205" = ["cn05.cgn-1"]; + "10.0.0.206" = ["cn06.cgn-1"]; + "10.0.0.207" = ["cn07.cgn-1"]; + "10.0.0.208" = ["cn08.cgn-1"]; + "10.0.1.200" = ["headnode.lev-1"]; + "10.0.1.201" = ["cn01.lev-1"]; + "10.0.1.202" = ["cn02.lev-1"]; + "10.0.1.203" = ["cn03.lev-1"]; + "10.0.1.204" = ["cn04.lev-1"]; + "10.0.1.205" = ["cn05.lev-1"]; + "10.0.1.206" = ["cn00.lev-1"]; + "10.0.1.207" = ["cn06.lev-1"]; + "10.0.1.208" = ["cn07.lev-1"]; + "10.101.64.10" = ["wifi.bahn.de"]; }; wireguard.enable = true; wg-quick.interfaces = { wg0 = { - address = [ "10.8.8.6/32" ]; + address = ["10.8.8.6/32"]; privateKeyFile = "/etc/wireguard/wg0.privatekey"; peers = [ { publicKey = "l0DJLicCrcrixNP6zAWTXNSEaNM2jML253BXEZ1KpiU="; - allowedIPs = [ "10.8.8.16/32" "10.0.0.0/24" "10.88.88.0/24" ]; + allowedIPs = ["10.8.8.16/32" "10.0.0.0/24" "10.88.88.0/24"]; endpoint = "85.88.23.16:51820"; persistentKeepalive = 25; } ]; }; wg1 = { - address = [ "10.13.0.1/32" ]; + address = ["10.13.0.1/32"]; privateKeyFile = "/etc/wireguard/wg1.privatekey"; mtu = 1412; peers = [ { publicKey = "XS3TTIMU7Jp3JJANBpE14RsVDJk6/VUvZgjQgQP8kAs="; - allowedIPs = [ "10.13.0.100/32" "192.168.188.0/24" ]; + allowedIPs = ["10.13.0.100/32" "192.168.188.0/24"]; + #endpoint = "85.214.70.91:51820"; endpoint = "[2a00:6020:48ad:dd00:dea6:32ff:fe85:3306]:51820"; persistentKeepalive = 25; } ]; }; wg2 = { - address = [ "10.6.6.4/32" ]; + address = ["10.6.6.4/32"]; privateKeyFile = "/etc/wireguard/wg2.privatekey"; peers = [ { publicKey = "nYMmaCIW8lZ7SokivN8HXxYDch+SS1G7ab1SC9meDAw="; presharedKeyFile = "/etc/wireguard/wg2.presharedkey"; - allowedIPs = [ "10.6.6.1/32" "10.1.1.0/24" ]; + allowedIPs = ["10.6.6.1/32" "10.1.1.0/24"]; endpoint = "85.88.23.127:51820"; persistentKeepalive = 16; } ]; }; wg3 = { - address = [ "10.11.11.2/32" ]; + address = ["10.11.11.2/32"]; privateKeyFile = "/etc/wireguard/wg3.privatekey"; mtu = 1300; @@ -78,7 +79,7 @@ { publicKey = "7RRgfZSneqAtAHBeI6+aaYLqz9e1jikg/lIK8mhW928="; presharedKeyFile = "/etc/wireguard/wg3.presharedkey"; - allowedIPs = [ "10.11.11.1/32" "192.168.1.0/24" "10.0.1.0/24" ]; + allowedIPs = ["10.11.11.0/24" "192.168.1.0/24" "10.0.1.0/24"]; endpoint = "80.71.153.1:51820"; persistentKeepalive = 16; }