diff --git a/config/git-gitea.nix b/config/git-gitea.nix index e7e3110..69701ff 100644 --- a/config/git-gitea.nix +++ b/config/git-gitea.nix @@ -17,6 +17,7 @@ createDatabase = false; }; settings = { + server.ROOT_URL = "https://${tools.build_hostname "git"}"; server.HTTP_PORT = 3000; }; dump = { diff --git a/config/proxy-traefik.nix b/config/proxy-traefik.nix index 53b2f55..1a394c7 100644 --- a/config/proxy-traefik.nix +++ b/config/proxy-traefik.nix @@ -249,6 +249,13 @@ in middlewares = [ "matrix-wellknown-mw" ]; tls.certResolver = "letsencrypt"; }; + traefik = { + rule = "Host(`proxy.${dmn}`) ${internal}"; + service = "proxy-service"; + entryPoints = [ "websecure" ]; + middlewares = [ "authentik" ]; + tls.certResolver = "letsencrypt"; + }; } ; @@ -293,6 +300,11 @@ in ) // { noop.loadBalancer.servers = [ ]; + proxy-service = { + loadBalancer.servers = [ + { url = "http://${ip "proxy"}:8080"; } + ]; + }; }; serversTransports = mergeConf ( (lib.mapAttrsToList ( diff --git a/containers/auth.nix b/containers/auth.nix index d0ebec8..e48c6ec 100644 --- a/containers/auth.nix +++ b/containers/auth.nix @@ -7,7 +7,7 @@ in container = { cores = 2; memory = 1024; - disk = "12G"; + disk = "8G"; swap = 1024; }; system = { diff --git a/containers/dns.nix b/containers/dns.nix index 6d4533b..fe38c11 100644 --- a/containers/dns.nix +++ b/containers/dns.nix @@ -6,7 +6,7 @@ container = { cores = 2; memory = 1024; - disk = "5G"; + disk = "5632M"; swap = 768; }; system = { diff --git a/containers/frigate.nix b/containers/frigate.nix index 04f6494..388acac 100644 --- a/containers/frigate.nix +++ b/containers/frigate.nix @@ -4,7 +4,7 @@ container = { cores = 4; memory = 2048; - disk = "12G"; + disk = "15G"; swap = 1024; }; system = { diff --git a/containers/power.nix b/containers/power.nix index 2c7a8ed..f1ff31b 100644 --- a/containers/power.nix +++ b/containers/power.nix @@ -5,7 +5,7 @@ container = { cores = 1; memory = 512; - disk = "4G"; + disk = "5G"; swap = 512; }; system = { diff --git a/containers/proxy.nix b/containers/proxy.nix index 16316c0..75f72df 100644 --- a/containers/proxy.nix +++ b/containers/proxy.nix @@ -8,10 +8,11 @@ swap = 512; }; system = { - port = 8080; + # port = 8080; additionalPorts = [ 80 443 + 8080 8082 ]; udpPorts = [ 443 ]; diff --git a/containers/z2m.nix b/containers/z2m.nix index dfff37d..afe1895 100644 --- a/containers/z2m.nix +++ b/containers/z2m.nix @@ -8,7 +8,7 @@ swap = 512; }; system = { - port = 80; + additionalPorts = [ 80 ]; importConfig = [ ../config/z2m-zigbee2mqtt.nix ];