b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

wireguard: change network to 10.13.12.0/24

Browse source
This commit is contained in:
Benjamin Yule Bädorf 2024-02-08 19:23:22 +01:00
parent 67e924f022
commit 5abeeb8751
Signed by: b12f
GPG key ID: 729956E1124F8F26
10 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/biolimo/networking.nix
View file

@ -12,7 +12,7 @@
pub-solar.wireguard-client = { pub-solar.wireguard-client = {
ownIPs = [ ownIPs = [
"10.0.1.6/32" "10.13.12.6/32"
"fd00:b12f:acab:1312:acab:6::/96" "fd00:b12f:acab:1312:acab:6::/96"
]; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; wireguardPrivateKeyFile = "/run/agenix/wg-private-key";

2
hosts/chocolatebar/networking.nix
View file

@ -11,7 +11,7 @@
pub-solar.wireguard-client = { pub-solar.wireguard-client = {
ownIPs = [ ownIPs = [
"10.0.1.5/32" "10.13.12.5/32"
"fd00:b12f:acab:1312:acab:5::/96" "fd00:b12f:acab:1312:acab:5::/96"
]; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; wireguardPrivateKeyFile = "/run/agenix/wg-private-key";

2
hosts/droppie/networking.nix
View file

@ -21,7 +21,7 @@
pub-solar.wireguard-client = { pub-solar.wireguard-client = {
ownIPs = [ ownIPs = [
"10.0.1.3/32" "10.13.12.3/32"
"fd00:b12f:acab:1312:acab:3::/96" "fd00:b12f:acab:1312:acab:3::/96"
]; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; wireguardPrivateKeyFile = "/run/agenix/wg-private-key";

20
hosts/frikandel/unbound.nix
View file

@ -44,40 +44,40 @@
"127.0.0.1" "127.0.0.1"
"::1" "::1"
"10.0.1.7" "10.13.12.7"
"fd00:b12f:acab:1312:acab:7::" "fd00:b12f:acab:1312:acab:7::"
]; ];
access-control = [ access-control = [
"127.0.0.1/32 allow" "127.0.0.1/32 allow"
# Allow from wireguard # Allow from wireguard
"10.0.1.0/24 allow" "10.13.12.0/24 allow"
"fd00:b12f:acab:1312::/64 allow" "fd00:b12f:acab:1312::/64 allow"
]; ];
local-zone = [ local-zone = [
"\"b12f.io\" transparent" "\"b12f.io\" transparent"
]; ];
local-data = [ local-data = [
"\"droppie.b12f.io. 10800 IN A 10.0.1.3\"" "\"droppie.b12f.io. 10800 IN A 10.13.12.3\""
"\"droppie.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:3::\"" "\"droppie.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:3::\""
"\"backup.b12f.io. 10800 IN A 10.0.1.3\"" "\"backup.b12f.io. 10800 IN A 10.13.12.3\""
"\"backup.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:3::\"" "\"backup.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:3::\""
"\"pie.b12f.io. 10800 IN A 10.0.1.2\"" "\"pie.b12f.io. 10800 IN A 10.13.12.2\""
"\"pie.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\"" "\"pie.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\""
"\"firefly.b12f.io. 10800 IN A 10.0.1.2\"" "\"firefly.b12f.io. 10800 IN A 10.13.12.2\""
"\"firefly.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\"" "\"firefly.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\""
"\"firefly-importer.b12f.io. 10800 IN A 10.0.1.2\"" "\"firefly-importer.b12f.io. 10800 IN A 10.13.12.2\""
"\"firefly-importer.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\"" "\"firefly-importer.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\""
"\"paperless.b12f.io. 10800 IN A 10.0.1.2\"" "\"paperless.b12f.io. 10800 IN A 10.13.12.2\""
"\"paperless.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\"" "\"paperless.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\""
"\"invoicing.b12f.io. 10800 IN A 10.0.1.2\"" "\"invoicing.b12f.io. 10800 IN A 10.13.12.2\""
"\"invoicing.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\"" "\"invoicing.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:2::\""
"\"vpn.b12f.io. 10800 IN A 128.140.109.213\"" "\"vpn.b12f.io. 10800 IN A 128.140.109.213\""
"\"vpn.b12f.io. 10800 IN AAAA 2a01:4f8:c2c:b60::\"" "\"vpn.b12f.io. 10800 IN AAAA 2a01:4f8:c2c:b60::\""
"\"frikandel.b12f.io. 10800 IN A 10.0.1.7\"" "\"frikandel.b12f.io. 10800 IN A 10.13.12.7\""
"\"frikandel.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\"" "\"frikandel.b12f.io. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\""
]; ];

12
hosts/frikandel/wireguard.nix
View file

@ -51,7 +51,7 @@
listenPort = 51899; listenPort = 51899;
mtu = 1300; mtu = 1300;
ips = [ ips = [
"10.0.1.7/32" "10.13.12.7/32"
"fd00:b12f:acab:1312:acab:7::/96" "fd00:b12f:acab:1312:acab:7::/96"
]; ];
privateKeyFile = "/run/agenix/wg-private-key-server"; privateKeyFile = "/run/agenix/wg-private-key-server";
@ -59,7 +59,7 @@
{ # pie { # pie
publicKey = "hPTXEqQ2GYEywdPNdZBacwB9KKcoFZ/heClxnqmizyw="; publicKey = "hPTXEqQ2GYEywdPNdZBacwB9KKcoFZ/heClxnqmizyw=";
allowedIPs = [ allowedIPs = [
"10.0.1.2/32" "10.13.12.2/32"
"fd00:b12f:acab:1312:acab:2::/96" "fd00:b12f:acab:1312:acab:2::/96"
]; ];
endpoint = "pie-wg.b12f.io:51899"; endpoint = "pie-wg.b12f.io:51899";
@ -68,7 +68,7 @@
{ # droppie { # droppie
publicKey = "qsnBMoj9Z16D8PJ5ummRtIfT5AiMpoF3SoOCo4sbyiw="; publicKey = "qsnBMoj9Z16D8PJ5ummRtIfT5AiMpoF3SoOCo4sbyiw=";
allowedIPs = [ allowedIPs = [
"10.0.1.3/32" "10.13.12.3/32"
"fd00:b12f:acab:1312:acab:3::/96" "fd00:b12f:acab:1312:acab:3::/96"
]; ];
@ -77,7 +77,7 @@
{ # chocolatebar { # chocolatebar
publicKey = "nk8EtGE/QsnSEm1lhLS3/w83nOBD2OGYhODIf92G91A="; publicKey = "nk8EtGE/QsnSEm1lhLS3/w83nOBD2OGYhODIf92G91A=";
allowedIPs = [ allowedIPs = [
"10.0.1.5/32" "10.13.12.5/32"
"fd00:b12f:acab:1312:acab:5::/96" "fd00:b12f:acab:1312:acab:5::/96"
]; ];
@ -86,7 +86,7 @@
{ # biolimo { # biolimo
publicKey = "4ymN7wwBuhF+h+5fFN0TqXmVyOe1AsWiTqRL0jJ3CDc="; publicKey = "4ymN7wwBuhF+h+5fFN0TqXmVyOe1AsWiTqRL0jJ3CDc=";
allowedIPs = [ allowedIPs = [
"10.0.1.6/32" "10.13.12.6/32"
"fd00:b12f:acab:1312:acab:6::/96" "fd00:b12f:acab:1312:acab:6::/96"
]; ];
@ -95,7 +95,7 @@
{ # stroopwafel { # stroopwafel
publicKey = "5iNRg13utOJ30pX2Z8SjwPNUFwfH2zonlbeYW2mKFkU="; publicKey = "5iNRg13utOJ30pX2Z8SjwPNUFwfH2zonlbeYW2mKFkU=";
allowedIPs = [ allowedIPs = [
"10.0.1.8/32" "10.13.12.8/32"
"fd00:b12f:acab:1312:acab:8::/96" "fd00:b12f:acab:1312:acab:8::/96"
]; ];

2
hosts/pie/networking.nix
View file

@ -31,7 +31,7 @@
pub-solar.wireguard-client = { pub-solar.wireguard-client = {
useDNS = false; useDNS = false;
ownIPs = [ ownIPs = [
"10.0.1.2/32" "10.13.12.2/32"
"fd00:b12f:acab:1312:acab:2::/96" "fd00:b12f:acab:1312:acab:2::/96"
]; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; wireguardPrivateKeyFile = "/run/agenix/wg-private-key";

2
hosts/pie/nginx.nix
View file

@ -18,7 +18,7 @@
defaultListenAddresses = [ defaultListenAddresses = [
"192.168.178.2" "192.168.178.2"
# "2a02:908:5b1:e3c0:2::" # "2a02:908:5b1:e3c0:2::"
"10.0.1.2" "10.13.12.2"
"[fd00:b12f:acab:1312:acab:2::]" "[fd00:b12f:acab:1312:acab:2::]"
]; ];
}; };

4
hosts/pie/unbound.nix
View file

@ -55,7 +55,7 @@
"2a02:908:5b1:e3c0::/64 allow" "2a02:908:5b1:e3c0::/64 allow"
# Allow from wireguard # Allow from wireguard
"10.0.1.0/24 allow" "10.13.12.0/24 allow"
"fd00:b12f:acab:1312::/64 allow" "fd00:b12f:acab:1312::/64 allow"
]; ];
local-zone = [ local-zone = [
@ -79,7 +79,7 @@
{ {
name = "."; name = ".";
forward-addr = [ forward-addr = [
"10.0.1.7" "10.13.12.7"
"fd00:b12f:acab:1312:acab:7::" "fd00:b12f:acab:1312:acab:7::"
"193.110.81.0#dns0.eu" "193.110.81.0#dns0.eu"

2
hosts/stroopwafel/networking.nix
View file

@ -12,7 +12,7 @@
pub-solar.wireguard-client = { pub-solar.wireguard-client = {
ownIPs = [ ownIPs = [
"10.0.1.8/32" "10.13.12.8/32"
"fd00:b12f:acab:1312:acab:8::/96" "fd00:b12f:acab:1312:acab:8::/96"
]; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; wireguardPrivateKeyFile = "/run/agenix/wg-private-key";

4
modules/wireguard-client/default.nix
View file

@ -68,7 +68,7 @@ in {
ips = cfg.ownIPs; ips = cfg.ownIPs;
privateKeyFile = cfg.wireguardPrivateKeyFile; privateKeyFile = cfg.wireguardPrivateKeyFile;
postSetup = lib.mkIf cfg.useDNS '' postSetup = lib.mkIf cfg.useDNS ''
printf "nameserver 10.0.1.7\nnameserver fd00:b12f:acab:1312:acab:7::" | resolvconf -a wg0 -m 0 -x printf "nameserver 10.13.12.7\nnameserver fd00:b12f:acab:1312:acab:7::" | resolvconf -a wg0 -m 0 -x
''; '';
postShutdown = lib.mkIf cfg.useDNS '' postShutdown = lib.mkIf cfg.useDNS ''
resolvconf -d wg0 -f resolvconf -d wg0 -f
@ -78,7 +78,7 @@ in {
# frikandel # frikandel
publicKey = "p6YKNYBlySKfhTN+wbSsKdoNjzko/XSAiTAlCJzP1jA="; publicKey = "p6YKNYBlySKfhTN+wbSsKdoNjzko/XSAiTAlCJzP1jA=";
allowedIPs = [ allowedIPs = [
"10.0.1.0/24" "10.13.12.0/24"
"fd00:b12f:acab:1312::/64" "fd00:b12f:acab:1312::/64"
] ++ (if cfg.fullTunnel then [ ] ++ (if cfg.fullTunnel then [
"0.0.0.0/0" "0.0.0.0/0"