Compare commits

..

2 Commits

Author SHA1 Message Date
soraefir be9cb5ccc0 async podman from rebuild 2026-06-21 17:58:53 +02:00
soraefir c357d13b21 container fixes 2026-06-21 17:57:12 +02:00
2 changed files with 12 additions and 3 deletions
+3 -1
View File
@@ -37,7 +37,9 @@ let
environment = { environment = {
TZ = config.time.timeZone; TZ = config.time.timeZone;
} // extraEnv; } // extraEnv;
autoRemoveOnStop = false;
autoStart = true;
pull = "newer";
labels = (if subdomain!=null then ({ labels = (if subdomain!=null then ({
"traefik.enable" = "true"; "traefik.enable" = "true";
"traefik.http.routers.${routerName}.entrypoints" = "web-secure"; "traefik.http.routers.${routerName}.entrypoints" = "web-secure";
+9 -2
View File
@@ -63,6 +63,12 @@ in {
startAt = "weekly"; startAt = "weekly";
}; };
} }
// builtins.listToAttrs (
map (name: {
name = "podman-${name}";
value.serviceConfig.Type = lib.mkForce "exec";
}) (builtins.attrNames config.virtualisation.oci-containers.containers)
)
// mkNamedUnits (e: { // mkNamedUnits (e: {
name = "${e.name}-vm"; name = "${e.name}-vm";
value = { value = {
@@ -90,7 +96,7 @@ in {
value = { value = {
description = "Run ${e.name} setup"; description = "Run ${e.name} setup";
after = [ "podman-${e.name}-${e.trigger}.service" ]; after = [ "podman-${e.name}-${e.trigger}.service" ];
wants = [ "podman-${e.name}-${e.trigger}.service" ]; # wants = [ "podman-${e.name}-${e.trigger}.service" ];
partOf = [ "podman-${e.name}-${e.trigger}.service" ]; partOf = [ "podman-${e.name}-${e.trigger}.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
restartTriggers = [ e.script ]; restartTriggers = [ e.script ];
@@ -98,7 +104,8 @@ in {
Type = "simple"; Type = "simple";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "15s"; RestartSec = "15s";
TimeoutStartSec = "360s"; # TimeoutStartSec = "360s";
TimeoutStartSec = "30s";
EnvironmentFile = e.envFile; EnvironmentFile = e.envFile;
ExecStart = e.script; ExecStart = e.script;
RemainAfterExit = true; RemainAfterExit = true;