diff options
| -rwxr-xr-x | deploy_nixos | 7 | ||||
| -rw-r--r-- | nix/configuration.nix | 2 | ||||
| -rw-r--r-- | nix/deuxfleurs.nix | 10 | ||||
| -rw-r--r-- | ssh_known_hosts | 3 |
4 files changed, 10 insertions, 12 deletions
diff --git a/deploy_nixos b/deploy_nixos index a716d6b..c4ce678 100755 --- a/deploy_nixos +++ b/deploy_nixos @@ -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.site.nix /etc/nixos/site.nix -cmd "nix-channel --add https://nixos.org/channels/nixos-22.05 nixos" -cmd nixos-rebuild switch --upgrade --show-trace +# use ./upgrade_nixos instead to upgrade NixOS +#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 diff --git a/nix/configuration.nix b/nix/configuration.nix index 2bb56f2..aa979db 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -66,8 +66,6 @@ SystemMaxUse=1G rclone docker-compose wireguard-tools - #qemu - #qemu_kvm ]; programs.vim.defaultEditor = true; diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix index 66c153c..e5925fd 100644 --- a/nix/deuxfleurs.nix +++ b/nix/deuxfleurs.nix @@ -200,13 +200,14 @@ in } ]; }; - resolveLocalQueries = false; # don't overwrite our resolv.conf + resolveLocalQueries = true; }; # Reach Unbound through the IP of our LAN interface, # instead of 127.0.0.1 (this will also work in Docker containers) networking.nameservers = [ cfg.lan_ip ]; + services.resolved.enable = false; # Configure Wireguard VPN between all nodes networking.wireguard.interfaces.wg0 = { @@ -272,8 +273,6 @@ in services.nomad.extraPackages = [ pkgs.glibc pkgs.zstd - #pkgs.qemu - #pkgs.qemu_kvm ]; services.nomad.settings = (if cfg.is_raft_server @@ -331,11 +330,6 @@ in ]; } ]; - #qemu = [ - # { - # enabled = true; - # } - #]; } ]; }; diff --git a/ssh_known_hosts b/ssh_known_hosts index a65f216..0086540 100644 --- a/ssh_known_hosts +++ b/ssh_known_hosts @@ -21,3 +21,6 @@ diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti df-ykl.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEwsKl1Bv8HJa+rO2KymEDhKEcDY3s9CQmDQ8i/tHf4E df-ymk.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIo6bcVtpZ+pRVs0vNaUgC0kY5ddPtWryUmFQTZjA+73 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 |