diff --git a/modules/nixos/system/hw/virt/default.nix b/modules/nixos/system/hw/virt/default.nix index f5becd2..e62bf6e 100644 --- a/modules/nixos/system/hw/virt/default.nix +++ b/modules/nixos/system/hw/virt/default.nix @@ -10,7 +10,11 @@ enable = true; dockerSocket.enable = true; dockerCompat = true; - defaultNetwork.settings.dnsname.enable = true; + defaultNetwork.settings = { + dnsname.enable = true; + internal = true; + name = "internal"; + }; }; }; }; diff --git a/modules/server/default.nix b/modules/server/default.nix index 7c7c331..680d1ba 100644 --- a/modules/server/default.nix +++ b/modules/server/default.nix @@ -1,13 +1,13 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let in { environment.systemPackages = with pkgs; [ arion ]; virtualisation.arion = { backend = "podman-socket"; projects = { - cloud.settings = import ./docker/cloud.nix { inherit config pkgs; }; + cloud.settings = import ./docker/cloud.nix { inherit config pkgs lib; }; authentik.settings = - import ./docker/authentik.nix { inherit config pkgs; }; + import ./docker/authentik.nix { inherit config pkgs lib; }; }; }; } diff --git a/modules/server/docker/authentik.nix b/modules/server/docker/authentik.nix index 5fbee02..1dfd981 100644 --- a/modules/server/docker/authentik.nix +++ b/modules/server/docker/authentik.nix @@ -1,14 +1,17 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let serverCfg = config.syscfg.server; in { project.name = "authentik"; networks = { internal = { + name = lib.mkForce "internal"; internal = true; - external = false; }; - external = { external = true; }; + external = { + name = lib.mkForce "external"; + internal = false; + }; }; services = { diff --git a/modules/server/docker/cloud.nix b/modules/server/docker/cloud.nix index 3c173ea..0fdc8ff 100644 --- a/modules/server/docker/cloud.nix +++ b/modules/server/docker/cloud.nix @@ -1,14 +1,17 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let serverCfg = config.syscfg.server; in { project.name = "cloud"; networks = { internal = { + name = lib.mkForce "internal"; internal = true; - external = false; }; - external = { external = true; }; + external = { + name = lib.mkForce "external"; + internal = false; + }; }; services = {