remove systemd-resolved
This commit is contained in:
parent
27214332e9
commit
7866a92e16
4 changed files with 10 additions and 12 deletions
|
@ -7,5 +7,8 @@ copy cluster/$CLUSTER/cluster.nix /etc/nixos/cluster.nix
|
||||||
copy cluster/$CLUSTER/node/$NIXHOST.nix /etc/nixos/node.nix
|
copy cluster/$CLUSTER/node/$NIXHOST.nix /etc/nixos/node.nix
|
||||||
copy cluster/$CLUSTER/node/$NIXHOST.site.nix /etc/nixos/site.nix
|
copy cluster/$CLUSTER/node/$NIXHOST.site.nix /etc/nixos/site.nix
|
||||||
|
|
||||||
cmd "nix-channel --add https://nixos.org/channels/nixos-22.05 nixos"
|
# use ./upgrade_nixos instead to upgrade NixOS
|
||||||
cmd nixos-rebuild switch --upgrade --show-trace
|
#cmd "nix-channel --add https://nixos.org/channels/nixos-22.05 nixos"
|
||||||
|
#cmd nixos-rebuild switch --upgrade --show-trace
|
||||||
|
|
||||||
|
cmd nixos-rebuild switch --show-trace
|
||||||
|
|
|
@ -66,8 +66,6 @@ SystemMaxUse=1G
|
||||||
rclone
|
rclone
|
||||||
docker-compose
|
docker-compose
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
#qemu
|
|
||||||
#qemu_kvm
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.vim.defaultEditor = true;
|
programs.vim.defaultEditor = true;
|
||||||
|
|
|
@ -200,13 +200,14 @@ in
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
resolveLocalQueries = false; # don't overwrite our resolv.conf
|
resolveLocalQueries = true;
|
||||||
};
|
};
|
||||||
# Reach Unbound through the IP of our LAN interface,
|
# Reach Unbound through the IP of our LAN interface,
|
||||||
# instead of 127.0.0.1 (this will also work in Docker containers)
|
# instead of 127.0.0.1 (this will also work in Docker containers)
|
||||||
networking.nameservers = [
|
networking.nameservers = [
|
||||||
cfg.lan_ip
|
cfg.lan_ip
|
||||||
];
|
];
|
||||||
|
services.resolved.enable = false;
|
||||||
|
|
||||||
# Configure Wireguard VPN between all nodes
|
# Configure Wireguard VPN between all nodes
|
||||||
networking.wireguard.interfaces.wg0 = {
|
networking.wireguard.interfaces.wg0 = {
|
||||||
|
@ -272,8 +273,6 @@ in
|
||||||
services.nomad.extraPackages = [
|
services.nomad.extraPackages = [
|
||||||
pkgs.glibc
|
pkgs.glibc
|
||||||
pkgs.zstd
|
pkgs.zstd
|
||||||
#pkgs.qemu
|
|
||||||
#pkgs.qemu_kvm
|
|
||||||
];
|
];
|
||||||
services.nomad.settings =
|
services.nomad.settings =
|
||||||
(if cfg.is_raft_server
|
(if cfg.is_raft_server
|
||||||
|
@ -331,11 +330,6 @@ in
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
#qemu = [
|
|
||||||
# {
|
|
||||||
# enabled = true;
|
|
||||||
# }
|
|
||||||
#];
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -21,3 +21,6 @@ diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti
|
||||||
df-ykl.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEwsKl1Bv8HJa+rO2KymEDhKEcDY3s9CQmDQ8i/tHf4E
|
df-ykl.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEwsKl1Bv8HJa+rO2KymEDhKEcDY3s9CQmDQ8i/tHf4E
|
||||||
df-ymk.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIo6bcVtpZ+pRVs0vNaUgC0kY5ddPtWryUmFQTZjA+73
|
df-ymk.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIo6bcVtpZ+pRVs0vNaUgC0kY5ddPtWryUmFQTZjA+73
|
||||||
df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+yyMxOOhY2DWSJB9tbjr2H7gFfQtbc
|
df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+yyMxOOhY2DWSJB9tbjr2H7gFfQtbc
|
||||||
|
2001:910:1204:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
|
||||||
|
2001:910:1204:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
|
||||||
|
2001:910:1204:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
|
||||||
|
|
Loading…
Reference in a new issue