diff --git a/modules/services/lib.nix b/modules/services/lib.nix index 405da34..a82d43d 100644 --- a/modules/services/lib.nix +++ b/modules/services/lib.nix @@ -118,7 +118,7 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)} ExecStart = "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml up --remove-orphans"; ExecStop = "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml down"; Restart = "on-failure"; - RestartSec = "1m"; + RestartSec = "3m"; }; }; @@ -134,7 +134,7 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)} Type = "oneshot"; RemainAfterExit = true; Restart = "on-failure"; - RestartSec = "1m"; + RestartSec = "5m"; }; script = '' mkdir -p /var/lib/numbus-server/${name} @@ -164,7 +164,7 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)} Type = "oneshot"; RemainAfterExit = true; Restart = "on-failure"; - RestartSec = "1m"; + RestartSec = "5m"; }; script = '' mkdir -p /var/lib/numbus-server/${name} diff --git a/modules/services/traefik.nix b/modules/services/traefik.nix index 74165db..bd9e6c8 100644 --- a/modules/services/traefik.nix +++ b/modules/services/traefik.nix @@ -41,7 +41,7 @@ helper.mkPodmanService { - "443:443/tcp" volumes: - /etc/${cfg.traefikStaticConfigDir}/config.yaml:/etc/traefik/traefik.yaml:ro - - /etc/${config.numbus.services.traefikDynamicConfigDir}:/etc/traefik/conf:ro + - /etc/${config.numbus.services.traefikDynamicConfigDir}:/etc/traefik/rules:ro - ${cfg.configDir}:/var/traefik/certs:rw environment: - CF_DNS_API_TOKEN=$CLOUDFLARE_DNS_API_TOKEN @@ -94,7 +94,7 @@ helper.mkPodmanService { insecureSkipVerify: true providers: file: - directory: "/etc/traefik/conf/" + directory: "/etc/traefik/rules" watch: true '';