Fix per link DNS resolvers

This commit is contained in:
Tim Schubert 2023-06-04 19:01:57 +02:00
parent 224570ac3f
commit 0e0415e81e
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
6 changed files with 19 additions and 10 deletions

View file

@ -22,7 +22,7 @@
services.smartd.enable = true; services.smartd.enable = true;
networking.hostName = "agares"; networking.hostName = "agares";
networking.domain = "dadada.li"; networking.domain = "bs.dadada.li";
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;

View file

@ -66,11 +66,6 @@ in
luks.uuid = "3d0e5b93-90ca-412a-b4e0-3e6bfa47d3f4"; luks.uuid = "3d0e5b93-90ca-412a-b4e0-3e6bfa47d3f4";
networking = { networking = {
enableBsShare = true; enableBsShare = true;
localResolver = {
enable = false;
uwu = true;
s0 = true;
};
vpnExtension = "3"; vpnExtension = "3";
}; };
sway.enable = false; sway.enable = false;
@ -168,6 +163,11 @@ in
networking.wireguard.interfaces.uwupn = { networking.wireguard.interfaces.uwupn = {
ips = [ "10.11.0.24/32" "fc00:1337:dead:beef::10.11.0.24/128" ]; ips = [ "10.11.0.24/32" "fc00:1337:dead:beef::10.11.0.24/128" ];
privateKeyFile = "/var/lib/wireguard/uwu"; privateKeyFile = "/var/lib/wireguard/uwu";
postSetup = ''
${pkgs.systemd}/bin/resolvectl domain uwupn ~uwu
${pkgs.systemd}/bin/resolvectl dns uwupn 10.0.0.1
'';
peers = [ peers = [
{ {
publicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8="; publicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8=";

View file

@ -18,6 +18,7 @@ in
}; };
networking.hostName = "ifrit"; networking.hostName = "ifrit";
networking.domain = "bs.dadada.li";
networking.hosts = { networking.hosts = {
"127.0.0.1" = hostAliases; "127.0.0.1" = hostAliases;

View file

@ -134,9 +134,11 @@ in
dadada = { dadada = {
ips = [ "fd42:9c3b:f96d:201::${cfg.vpnExtension}/64" ]; ips = [ "fd42:9c3b:f96d:201::${cfg.vpnExtension}/64" ];
listenPort = 51234; listenPort = 51234;
privateKeyFile = "/var/lib/wireguard/privkey"; privateKeyFile = "/var/lib/wireguard/privkey";
postSetup = ''
${pkgs.systemd}/bin/resolvectl domain dadada ~bs.dadada.li
${pkgs.systemd}/bin/resolvectl dns dadada fd42:9c3b:f96d:201::
'';
peers = [ peers = [
{ {
publicKey = vpnPubKey; publicKey = vpnPubKey;

View file

@ -54,5 +54,8 @@ in
highlighters = [ "main" "brackets" "pattern" "root" "line" ]; highlighters = [ "main" "brackets" "pattern" "root" "line" ];
}; };
}; };
networking.networkmanager.dns = mkDefault "systemd-resolved";
services.resolved.enable = mkDefault true;
} }

View file

@ -21,6 +21,7 @@ in
dadada.backupClient.bs.enable = false; dadada.backupClient.bs.enable = false;
networking.hostName = "ninurta"; networking.hostName = "ninurta";
networking.domain = "bs.dadada.li";
networking.hosts = { networking.hosts = {
"127.0.0.1" = hostAliases; "127.0.0.1" = hostAliases;
@ -47,8 +48,8 @@ in
hostKeys = [ initrdSshKey ]; hostKeys = [ initrdSshKey ];
}; };
postCommands = '' postCommands = ''
echo 'systemctl restart systemd-cryptsetup@luks.service' >> /root/.profile echo 'systemctl restart systemd-cryptsetup@luks.service' >> /root/.profile
''; '';
}; };
# Kinda does not work? # Kinda does not work?
systemd = { systemd = {
@ -204,6 +205,8 @@ in
"10-uwu" = { "10-uwu" = {
matchConfig.Name = "uwu"; matchConfig.Name = "uwu";
address = [ "10.11.0.39/24" "fc00:1337:dead:beef::10.11.0.39/128" ]; address = [ "10.11.0.39/24" "fc00:1337:dead:beef::10.11.0.39/128" ];
dns = [ "10.11.0.1::%uwu#uwu" ];
domains = [ "uwu" ];
DHCP = "no"; DHCP = "no";
networkConfig.IPv6AcceptRA = false; networkConfig.IPv6AcceptRA = false;
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = "no";