diff options
author | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-10-16 13:56:42 +0200 |
---|---|---|
committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-10-16 13:56:42 +0200 |
commit | a07b185055cda8b4b51aeee343a145ff421d4157 (patch) | |
tree | 2019c0c3b125267435c9417c037c45abefcde4e2 | |
parent | b43ac06aa79c4612b344c1bf27b1553e6485ede7 (diff) | |
parent | 38a544d9c45a7c6ce682d8677e52f022d9547177 (diff) | |
download | nixcfg-a07b185055cda8b4b51aeee343a145ff421d4157.tar.gz nixcfg-a07b185055cda8b4b51aeee343a145ff421d4157.zip |
Merge branch 'main' into add-bespin
-rw-r--r-- | nix/configuration.nix | 7 | ||||
-rw-r--r-- | nix/deuxfleurs.nix | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nix/configuration.nix b/nix/configuration.nix index 17bb9b8..800d36d 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -64,7 +64,6 @@ SystemMaxUse=1G links2 git rclone - docker docker-compose wireguard-tools #qemu @@ -81,6 +80,12 @@ SystemMaxUse=1G services.openssh.enable = true; services.openssh.passwordAuthentication = false; + virtualisation.docker = { + enable = true; + extraOptions = "--config-file=${pkgs.writeText "daemon.json" (builtins.toJSON { + dns = [ "172.17.0.1" "8.8.8.8" "8.8.4.4" ]; + })}"; + }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix index 82111ed..3e880cc 100644 --- a/nix/deuxfleurs.nix +++ b/nix/deuxfleurs.nix @@ -173,7 +173,7 @@ in enable = true; settings = { server = { - interface = [ "127.0.0.1" "${cfg.lan_ip}" ]; + interface = [ "127.0.0.1" "${cfg.lan_ip}" "172.17.0.1" ]; domain-insecure = [ "consul." ]; local-zone = [ "consul. nodefault" ]; log-servfail = true; |