AZ-Intec-GmbH/AZ-NIX-SERVERS
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: zammad startup restart-always

Browse Source
This commit is contained in:
Sascha König
2026-07-01 06:30:39 +02:00
parent 10b778fa8e
commit 800a78848d
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+13 -13
View File
@@ -733,11 +733,11 @@
"openspec": "openspec_2" "openspec": "openspec_2"
}, },
"locked": { "locked": {
"lastModified": 1782364199, "lastModified": 1782800249,
"narHash": "sha256-uPNb0Mpror1QVMnoxxSrc3538jcj4cUKfFN2oXAPxXk=", "narHash": "sha256-jslSMVQf3sn9wC+DkXUW245He/64JxVX4j4y7y2HS+U=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "f0c028a62c54d37f5bd52fe0656a613d04acefd8", "rev": "e695a8c6364c118ea60534a7be8eb2097e804e24",
"revCount": 331, "revCount": 333,
"type": "git", "type": "git",
"url": "https://code.m3ta.dev/m3tam3re/nixpkgs" "url": "https://code.m3ta.dev/m3tam3re/nixpkgs"
}, },
@@ -955,11 +955,11 @@
}, },
"nixpkgs-master_2": { "nixpkgs-master_2": {
"locked": { "locked": {
"lastModified": 1781153468, "lastModified": 1782540244,
"narHash": "sha256-ZBRmjFtJn/XmHBV230OSabKQqxOoOJunJmBtSt1sLs0=", "narHash": "sha256-3skOZJEfAUG7LSB/Ok2AQUiqeagYLSq+8wKjtS1hOyc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd265fd6b43f2ec1257c2e400f648895d2ad7ccd", "rev": "a65184fc373636356fcaf460dc09655a919c66ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1067,11 +1067,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1780749050, "lastModified": 1782467914,
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1244,11 +1244,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780479100, "lastModified": 1782291243,
"narHash": "sha256-VZZ/ukjciXqiebwei2JizyOnxx0T3IeoowFWElKec4o=", "narHash": "sha256-0pVn5pDqlKpqSgzf4eG9TFCjkjzOtnmGTpbILso7GwI=",
"owner": "Fission-AI", "owner": "Fission-AI",
"repo": "OpenSpec", "repo": "OpenSpec",
"rev": "1b06fddd59d8e592d5b5794a1970b22867e85b1f", "rev": "737518b36fe4b6fdb09c83eeaf8d873a428c92e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
hosts/AZ-CLD-1/services/containers/zammad-hr.nix
+24 -2
View File
@@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: let }: let
instanceName = "hr"; instanceName = "hr";
@@ -45,7 +46,15 @@
NGINX_SERVER_NAME = zammadDomain; NGINX_SERVER_NAME = zammadDomain;
ZAMMAD_HTTP_TYPE = "https"; ZAMMAD_HTTP_TYPE = "https";
ZAMMAD_FQDN = zammadDomain; ZAMMAD_FQDN = zammadDomain;
RAILS_TRUSTED_PROXIES = "['127.0.0.1', '::1', '10.89.0.0/24']"; RAILS_TRUSTED_PROXIES = "127.0.0.1,::1,${ipBase}.1,${ipBase}.${toString (ipOffset + 7)}";
};
alwaysRestart = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
RestartSec = lib.mkOverride 90 "10s";
StartLimitIntervalSec = lib.mkOverride 90 0;
};
}; };
in { in {
virtualisation.oci-containers = { virtualisation.oci-containers = {
@@ -142,7 +151,6 @@ in {
environment = sharedEnvironment; environment = sharedEnvironment;
environmentFiles = [envFileCommon envFileProd]; environmentFiles = [envFileCommon envFileProd];
volumes = ["${serviceName}_storage:/opt/zammad/storage"]; volumes = ["${serviceName}_storage:/opt/zammad/storage"];
dependsOn = ["${serviceName}-railsserver"];
ports = ["127.0.0.1:${toString servicePort}:8080"]; ports = ["127.0.0.1:${toString servicePort}:8080"];
extraOptions = [ extraOptions = [
"--ip=${ipBase}.${toString (ipOffset + 7)}" "--ip=${ipBase}.${toString (ipOffset + 7)}"
@@ -171,6 +179,20 @@ in {
}; };
}; };
systemd.services."podman-${serviceName}-elasticsearch" = alwaysRestart;
systemd.services."podman-${serviceName}-memcached" = alwaysRestart;
systemd.services."podman-${serviceName}-redis" = alwaysRestart;
systemd.services."podman-${serviceName}-railsserver" = alwaysRestart;
systemd.services."podman-${serviceName}-scheduler" = alwaysRestart;
systemd.services."podman-${serviceName}-websocket" = alwaysRestart;
systemd.services."podman-${serviceName}-nginx" =
alwaysRestart
// {
after = ["podman-${serviceName}-railsserver.service"];
wants = ["podman-${serviceName}-railsserver.service"];
};
# Init als oneshot systemd-Service # Init als oneshot systemd-Service
systemd.services."${serviceName}-init" = { systemd.services."${serviceName}-init" = {
description = "Zammad ${instanceName} Database Initialization"; description = "Zammad ${instanceName} Database Initialization";