Merge branch 'main' into add-bespin

This commit is contained in:
Quentin 2022-10-16 13:56:42 +02:00
commit a07b185055
Signed by: quentin
GPG key ID: E9602264D639FF68
2 changed files with 7 additions and 2 deletions

View file

@ -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

View file

@ -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;