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

fix: wireguard ipv6 and dns

Browse source
This commit is contained in:
Benjamin Bädorf 2023-10-20 00:37:08 +02:00
parent 2b5f04fa86
commit be380f2c01
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hosts/pie/ddclient.nix
View file

@ -9,9 +9,6 @@ with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
getIP4 = with pkgs; writeShellScriptBin "getIP" ''
${curl}/bin/curl -4 https://ipcheck-ds.wieistmeineip.de/callback/ | ${coreutils}/bin/tail -c +2 | ${coreutils}/bin/head -c -1 | ${jq}/bin/jq '.ip' -r
'';
getIP6 = with pkgs; writeShellScriptBin "getIP" '' getIP6 = with pkgs; writeShellScriptBin "getIP" ''
${curl}/bin/curl -6 https://ipcheck-ds.wieistmeineip.de/callback/ | ${coreutils}/bin/tail -c +2 | ${coreutils}/bin/head -c -1 | ${jq}/bin/jq '.ip' -r ${curl}/bin/curl -6 https://ipcheck-ds.wieistmeineip.de/callback/ | ${coreutils}/bin/tail -c +2 | ${coreutils}/bin/head -c -1 | ${jq}/bin/jq '.ip' -r
''; '';
@ -29,7 +26,6 @@ in {
]; ];
server = "ddns.hosting.de"; server = "ddns.hosting.de";
username = "b12f"; username = "b12f";
usev4 = "cmdv4, cmdv4=${getIP4}/bin/getIP";
usev6 = "cmdv6, cmdv6=${getIP6}/bin/getIP"; usev6 = "cmdv6, cmdv6=${getIP6}/bin/getIP";
verbose = true; verbose = true;
passwordFile = "/run/agenix/dyndns.key"; passwordFile = "/run/agenix/dyndns.key";

16
hosts/pie/dhcpd.nix
View file

@ -107,7 +107,7 @@
code = 23; code = 23;
space = "dhcp6"; space = "dhcp6";
csv-format = true; csv-format = true;
data = "2a02:908:5b1:e3c0:3077:4e39:7763:b5b7"; data = "2a02:908:5b1:e3c0:3077:4e39:7763:2";
} }
]; ];
@ -126,6 +126,20 @@
"2a02:908:5b1:e3c0:3077:4e39:7763:2" "2a02:908:5b1:e3c0:3077:4e39:7763:2"
]; ];
} }
{
hostname = "chocolatebar.local";
hw-address = "04:d9:f5:fa:35:f5";
ip-addresses = [
"2a02:908:5b1:e3c0:3077:4e39:7763:5"
];
}
{
hostname = "biolimo.local";
hw-address = "c6:f2:d1:df:ed:a4";
ip-addresses = [
"2a02:908:5b1:e3c0:3077:4e39:7763:6"
];
}
]; ];
} }
]; ];

8
hosts/pie/unbound.nix
View file

@ -26,13 +26,17 @@
"\"brwb8763f64a364.local. 10800 IN A 192.168.178.4\"" "\"brwb8763f64a364.local. 10800 IN A 192.168.178.4\""
"\"droppie.local. 10800 IN A 192.168.178.3\"" "\"droppie.local. 10800 IN A 192.168.178.3\""
"\"droppie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:b5b8\"" "\"droppie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:3\""
"\"droppie.b12f.io. 10800 IN A 10.0.1.3\"" "\"droppie.b12f.io. 10800 IN A 10.0.1.3\""
"\"droppie.b12f.io. 10800 IN AAAA fd00:acab:1312:acab:3::\"" "\"droppie.b12f.io. 10800 IN AAAA fd00:acab:1312:acab:3::\""
"\"backup.b12f.io. 10800 IN CNAME droppie.b12f.io\"" "\"backup.b12f.io. 10800 IN CNAME droppie.b12f.io\""
"\"pie.local. 10800 IN A 192.168.178.2\"" "\"pie.local. 10800 IN A 192.168.178.2\""
"\"pie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:b5b7\"" "\"pie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:2\""
"\"vpn.b12f.io. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:2\""
"\"pie.b12f.io. 10800 IN A 10.0.1.2\"" "\"pie.b12f.io. 10800 IN A 10.0.1.2\""
"\"pie.b12f.io. 10800 IN AAAA fd00:acab:1312:acab:2::\"" "\"pie.b12f.io. 10800 IN AAAA fd00:acab:1312:acab:2::\""
"\"firefly.b12f.io. 10800 IN CNAME pie.b12f.io\"" "\"firefly.b12f.io. 10800 IN CNAME pie.b12f.io\""

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

@ -44,7 +44,7 @@ in {
"10.0.1.0/32" "10.0.1.0/32"
"fd00:acab:1312:acab:0::/128" "fd00:acab:1312:acab:0::/128"
]; ];
endpoint = "vpn.b12f.io:51899"; endpoint = "[2a02:908:5b1:e3c0:3077:4e39:7763:2]:51899";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
]; ];