fix: zammad startup restart-always
This commit is contained in:
Generated
+13
-13
@@ -733,11 +733,11 @@
|
||||
"openspec": "openspec_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1782364199,
|
||||
"narHash": "sha256-uPNb0Mpror1QVMnoxxSrc3538jcj4cUKfFN2oXAPxXk=",
|
||||
"lastModified": 1782800249,
|
||||
"narHash": "sha256-jslSMVQf3sn9wC+DkXUW245He/64JxVX4j4y7y2HS+U=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "f0c028a62c54d37f5bd52fe0656a613d04acefd8",
|
||||
"revCount": 331,
|
||||
"rev": "e695a8c6364c118ea60534a7be8eb2097e804e24",
|
||||
"revCount": 333,
|
||||
"type": "git",
|
||||
"url": "https://code.m3ta.dev/m3tam3re/nixpkgs"
|
||||
},
|
||||
@@ -955,11 +955,11 @@
|
||||
},
|
||||
"nixpkgs-master_2": {
|
||||
"locked": {
|
||||
"lastModified": 1781153468,
|
||||
"narHash": "sha256-ZBRmjFtJn/XmHBV230OSabKQqxOoOJunJmBtSt1sLs0=",
|
||||
"lastModified": 1782540244,
|
||||
"narHash": "sha256-3skOZJEfAUG7LSB/Ok2AQUiqeagYLSq+8wKjtS1hOyc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cd265fd6b43f2ec1257c2e400f648895d2ad7ccd",
|
||||
"rev": "a65184fc373636356fcaf460dc09655a919c66ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1067,11 +1067,11 @@
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1780749050,
|
||||
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
|
||||
"lastModified": 1782467914,
|
||||
"narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
|
||||
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1244,11 +1244,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780479100,
|
||||
"narHash": "sha256-VZZ/ukjciXqiebwei2JizyOnxx0T3IeoowFWElKec4o=",
|
||||
"lastModified": 1782291243,
|
||||
"narHash": "sha256-0pVn5pDqlKpqSgzf4eG9TFCjkjzOtnmGTpbILso7GwI=",
|
||||
"owner": "Fission-AI",
|
||||
"repo": "OpenSpec",
|
||||
"rev": "1b06fddd59d8e592d5b5794a1970b22867e85b1f",
|
||||
"rev": "737518b36fe4b6fdb09c83eeaf8d873a428c92e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
instanceName = "hr";
|
||||
@@ -45,7 +46,15 @@
|
||||
NGINX_SERVER_NAME = zammadDomain;
|
||||
ZAMMAD_HTTP_TYPE = "https";
|
||||
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 {
|
||||
virtualisation.oci-containers = {
|
||||
@@ -142,7 +151,6 @@ in {
|
||||
environment = sharedEnvironment;
|
||||
environmentFiles = [envFileCommon envFileProd];
|
||||
volumes = ["${serviceName}_storage:/opt/zammad/storage"];
|
||||
dependsOn = ["${serviceName}-railsserver"];
|
||||
ports = ["127.0.0.1:${toString servicePort}:8080"];
|
||||
extraOptions = [
|
||||
"--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
|
||||
systemd.services."${serviceName}-init" = {
|
||||
description = "Zammad ${instanceName} Database Initialization";
|
||||
|
||||
Reference in New Issue
Block a user