diff --git a/modules/netbird-docker.nix b/modules/netbird-docker.nix index 076fdaf..a71f2ed 100644 --- a/modules/netbird-docker.nix +++ b/modules/netbird-docker.nix @@ -54,7 +54,7 @@ in { image = "netbirdio/dashboard:v${dashboardVersion}"; autoStart = true; networks = [ - "webproxy" + "traefik" ]; environment = { NETBIRD_MGMT_API_ENDPOINT = "https://${netbirdCfg.server.management.domain}"; @@ -88,7 +88,7 @@ in { image = "netbirdio/netbird-server:${serverVersion}"; autoStart = true; networks = [ - "webproxy" + "traefik" ]; entrypoint = "/bin/sh"; cmd = [ @@ -169,7 +169,7 @@ in { "51820:51820/udp" ]; networks = [ - "webproxy" + "traefik" ]; dependsOn = [ "netbird-server" diff --git a/modules/pocket-id.nix b/modules/pocket-id.nix index 48ac9cb..c279e3e 100644 --- a/modules/pocket-id.nix +++ b/modules/pocket-id.nix @@ -21,7 +21,7 @@ in { image = "ghcr.io/pocket-id/pocket-id:v${version}"; autoStart = true; networks = [ - "webproxy" + "traefik" ]; environment = { APP_URL = pocketidCfg.settings.APP_URL; diff --git a/modules/traefik.nix b/modules/traefik.nix index 8888dac..7f4ef6b 100644 --- a/modules/traefik.nix +++ b/modules/traefik.nix @@ -35,7 +35,7 @@ in { "--providers.docker=true" "--providers.docker.endpoint=http://docker-socket-proxy:2375" "--providers.docker.exposedByDefault=false" - "--providers.docker.network=webproxy" + "--providers.docker.network=traefik" "--providers.file.directory=/dynamic-config" "--log.level=INFO" "--api=true" @@ -62,7 +62,7 @@ in { "443:443" ]; networks = [ - "webproxy" + "traefik" "docker-socket" ]; environmentFiles = lib.forEach cfg.dnsSecrets (secret: secret.path); @@ -102,22 +102,22 @@ in { systemd.services."docker-traefik" = { after = [ - "docker-network-webproxy.service" + "docker-network-traefik.service" "docker-network-docker-socket.service" ]; requires = [ - "docker-network-webproxy.service" + "docker-network-traefik.service" "docker-network-docker-socket.service" ]; }; - systemd.services."docker-network-webproxy" = { + systemd.services."docker-network-traefik" = { path = [ pkgs.docker ]; serviceConfig = { Type = "oneshot"; }; script = '' - docker network inspect webproxy || docker network create webproxy --ipv4 --ipv6 --subnet=172.18.0.0/16 --gateway=172.18.0.1 + docker network inspect traefik || docker network create traefik --ipv4 --ipv6 --subnet=172.18.0.0/16 --gateway=172.18.0.1 ''; };