1
0
Fork 0

podman: Set TimeoutStopSec

This commit is contained in:
Daniel Kempkens 2023-03-24 22:30:50 +01:00
parent 2af0a118b0
commit a2d0976f7f
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
3 changed files with 22 additions and 4 deletions

View file

@ -44,6 +44,18 @@
}; };
}; };
systemd.services.podman-signald.serviceConfig = {
TimeoutStopSec = lib.mkForce 5;
};
systemd.services.podman-matrix-signal.serviceConfig = {
TimeoutStopSec = lib.mkForce 5;
};
systemd.services.podman-matrix-whatsapp.serviceConfig = {
TimeoutStopSec = lib.mkForce 5;
};
networking.firewall.interfaces."podman+" = { networking.firewall.interfaces."podman+" = {
allowedUDPPorts = [ 443 ]; allowedUDPPorts = [ 443 ];
allowedTCPPorts = [ 443 ]; allowedTCPPorts = [ 443 ];

View file

@ -25,13 +25,12 @@
}; };
}; };
# The proxitok-* container doesn't play nicely with SIGTERM
systemd.services.podman-proxitok-web.serviceConfig = { systemd.services.podman-proxitok-web.serviceConfig = {
TimeoutStopSec = lib.mkForce 2; TimeoutStopSec = lib.mkForce 5;
}; };
systemd.services.podman-proxitok-signer.serviceConfig = { systemd.services.podman-proxitok-signer.serviceConfig = {
TimeoutStopSec = lib.mkForce 2; TimeoutStopSec = lib.mkForce 5;
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [

View file

@ -1,4 +1,4 @@
{ config, ... }: { config, lib, ... }:
let let
secret = import ../../secret/container/weewx; secret = import ../../secret/container/weewx;
@ -20,6 +20,10 @@ in
]; ];
}; };
systemd.services.podman-weewx.serviceConfig = {
TimeoutStopSec = lib.mkForce 5;
};
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d ${data-dir} 0755 421 421" "d ${data-dir} 0755 421 421"
"d ${data-dir}/html 0755 421 421" "d ${data-dir}/html 0755 421 421"
@ -83,6 +87,9 @@ in
locations."~ ^/dwd/(icons|warn_icons)/" = { locations."~ ^/dwd/(icons|warn_icons)/" = {
root = "${data-dir}/static_html"; root = "${data-dir}/static_html";
extraConfig = ''
expires 7d;
'';
}; };
locations."~ ^/dwd/[\w]+\.(gif|png)".extraConfig = '' locations."~ ^/dwd/[\w]+\.(gif|png)".extraConfig = ''