Fix e-mails for mantisbt

diff --git a/deploy/flake.lock b/deploy/flake.lock
index 4b198c36969b3b28e7f6c51bdcc15dea0cb095fe..c2c6375579b091b27335cc7de6c2dda1c53b3d7b 100644 (file)
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2783,7 +2783,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-EZcisGqD3wheTJAM1CbcbW1RsNmeIkcGTJrLxD/vP1g=",
+        "narHash": "sha256-j0OnENErgwj9vDdg8EUu8gBZkVmJ9dMhtdV+7rTkiCQ=",
         "path": "../flakes",
         "type": "path"
       },
@@ -3095,7 +3095,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3112,7 +3112,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3129,7 +3129,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3146,7 +3146,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3163,7 +3163,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3180,7 +3180,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3197,7 +3197,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3214,7 +3214,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3231,7 +3231,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3248,7 +3248,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3265,7 +3265,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3282,7 +3282,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3299,7 +3299,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3832,7 +3832,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zu5070QLfELfpNFnWS/4/MXSNad9RyYRbcPQzgInUEQ=",
+        "narHash": "sha256-60yr/wCF+U3z+wYR+UEgM+68nc4/CWkoIAjJsMpUG8c=",
         "path": "../systems/backup-2",
         "type": "path"
       },
@@ -3855,7 +3855,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Ad8zF+T8B7Xvbv72PnLeVojBKZxbISegAe2Oj157wjc=",
+        "narHash": "sha256-9geQj091r2/Sxi8/ghsp5mO8MIT/kT+nEL3PKgwuApc=",
         "path": "../systems/dilion",
         "type": "path"
       },
@@ -3903,7 +3903,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-IiNmTt+EL9aW6oEWp/JyUfjVLnLAu2MfX9e0b8J7/h0=",
+        "narHash": "sha256-MB/c+BVgQQ3qjAchd1Oe8qvg9UbFcY0xhxpj9RkEOnI=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3929,7 +3929,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-1LFmQtb2WYZgzgVLKMiOfWyysRubWGNElj/OSDMcYio=",
+        "narHash": "sha256-nV8j6HW6B93HEbeiy43tKCGV9J6xR7jIkAUZVbkKDt4=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3954,7 +3954,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-OhtanD0Sha8E1TSAdb2Za55EVOylpNHUhxGXn5JhfIU=",
+        "narHash": "sha256-4vXBjKeelh3z1l7ZYO0ucB2cZPuVJsYX7yZV3MDGqdk=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -3974,7 +3974,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-191b6BmFlc9NjTu9uVthcaXMQ5vbD5m0SNZEK2L5nBI=",
+        "narHash": "sha256-Xq8DqtsC5MIUnFBbK1YYSS+eEgqJTeIC7GgFeMs8dAc=",
         "path": "../systems/zoldene",
         "type": "path"
       },
@@ -7656,7 +7656,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7675,7 +7675,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7728,7 +7728,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=",
+        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
         "path": "../../flakes/etherpad-lite",
         "type": "path"
       },
@@ -7770,7 +7770,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=",
+        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
         "path": "../../flakes/grocy",
         "type": "path"
       },
@@ -7851,7 +7851,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../flakes/mypackages",
         "type": "path"
       },
@@ -7974,7 +7974,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=",
+        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
         "path": "../../flakes/surfer",
         "type": "path"
       },
@@ -8080,7 +8080,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=",
+        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
         "path": "./etherpad-lite",
         "type": "path"
       },
@@ -8122,7 +8122,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=",
+        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
         "path": "./grocy",
         "type": "path"
       },
@@ -8222,7 +8222,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "./mypackages",
         "type": "path"
       },
@@ -8527,7 +8527,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "./private/system",
         "type": "path"
       },
@@ -8569,7 +8569,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=",
+        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
         "path": "./surfer",
         "type": "path"
       },
@@ -8888,11 +8888,11 @@
         "nixpkgs": "nixpkgs_106"
       },
       "locked": {
-        "lastModified": 1720312456,
-        "narHash": "sha256-QTS2+W2Azb8y2lESQp4qJTDnfy3KpX+VheajRfDBcAs=",
+        "lastModified": 1722637825,
+        "narHash": "sha256-nVRtZ9lu7ILJPA+wNn5D+5R7nJBKtfY0Rx335xVUYFw=",
         "ref": "master",
-        "rev": "92f3b74c6408e446e51e6c1ff57269cac4382b16",
-        "revCount": 742,
+        "rev": "c0221952994e304539e9cccd5db8e818df4e6e51",
+        "revCount": 747,
         "type": "git",
         "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets"
       },
@@ -9140,7 +9140,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9159,7 +9159,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9178,7 +9178,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9197,7 +9197,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },

diff --git a/flake.lock b/flake.lock
index bf3a6b0ef534b7272eefaf8de619f555be227e6c..f3760cc31bc1595b9e0fabdc0cf961d0e09e7849 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -2664,7 +2664,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-EZcisGqD3wheTJAM1CbcbW1RsNmeIkcGTJrLxD/vP1g=",
+        "narHash": "sha256-j0OnENErgwj9vDdg8EUu8gBZkVmJ9dMhtdV+7rTkiCQ=",
         "path": "./flakes",
         "type": "path"
       },
@@ -3111,7 +3111,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3128,7 +3128,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3145,7 +3145,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3162,7 +3162,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3179,7 +3179,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3196,7 +3196,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3213,7 +3213,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3230,7 +3230,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3247,7 +3247,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3264,7 +3264,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3281,7 +3281,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3298,7 +3298,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3315,7 +3315,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3848,7 +3848,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zu5070QLfELfpNFnWS/4/MXSNad9RyYRbcPQzgInUEQ=",
+        "narHash": "sha256-60yr/wCF+U3z+wYR+UEgM+68nc4/CWkoIAjJsMpUG8c=",
         "path": "../systems/backup-2",
         "type": "path"
       },
@@ -3871,7 +3871,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Ad8zF+T8B7Xvbv72PnLeVojBKZxbISegAe2Oj157wjc=",
+        "narHash": "sha256-9geQj091r2/Sxi8/ghsp5mO8MIT/kT+nEL3PKgwuApc=",
         "path": "../systems/dilion",
         "type": "path"
       },
@@ -3919,7 +3919,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-IiNmTt+EL9aW6oEWp/JyUfjVLnLAu2MfX9e0b8J7/h0=",
+        "narHash": "sha256-MB/c+BVgQQ3qjAchd1Oe8qvg9UbFcY0xhxpj9RkEOnI=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3945,7 +3945,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-1LFmQtb2WYZgzgVLKMiOfWyysRubWGNElj/OSDMcYio=",
+        "narHash": "sha256-nV8j6HW6B93HEbeiy43tKCGV9J6xR7jIkAUZVbkKDt4=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3970,7 +3970,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-OhtanD0Sha8E1TSAdb2Za55EVOylpNHUhxGXn5JhfIU=",
+        "narHash": "sha256-4vXBjKeelh3z1l7ZYO0ucB2cZPuVJsYX7yZV3MDGqdk=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -3990,7 +3990,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-191b6BmFlc9NjTu9uVthcaXMQ5vbD5m0SNZEK2L5nBI=",
+        "narHash": "sha256-Xq8DqtsC5MIUnFBbK1YYSS+eEgqJTeIC7GgFeMs8dAc=",
         "path": "../systems/zoldene",
         "type": "path"
       },
@@ -7672,7 +7672,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7691,7 +7691,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7744,7 +7744,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=",
+        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
         "path": "../../flakes/etherpad-lite",
         "type": "path"
       },
@@ -7786,7 +7786,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=",
+        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
         "path": "../../flakes/grocy",
         "type": "path"
       },
@@ -7867,7 +7867,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../flakes/mypackages",
         "type": "path"
       },
@@ -7990,7 +7990,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=",
+        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
         "path": "../../flakes/surfer",
         "type": "path"
       },
@@ -8096,7 +8096,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=",
+        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
         "path": "./etherpad-lite",
         "type": "path"
       },
@@ -8138,7 +8138,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=",
+        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
         "path": "./grocy",
         "type": "path"
       },
@@ -8238,7 +8238,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "./mypackages",
         "type": "path"
       },
@@ -8543,7 +8543,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "./private/system",
         "type": "path"
       },
@@ -8585,7 +8585,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=",
+        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
         "path": "./surfer",
         "type": "path"
       },
@@ -9149,7 +9149,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9168,7 +9168,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9187,7 +9187,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9206,7 +9206,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },

diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock
index c8fff34365585e255dfe30f8c7252e73e49f552e..4b29cffedfc9902f485a137d48aefd0374dbea69 100644 (file)
--- a/flakes/etherpad-lite/flake.lock
+++ b/flakes/etherpad-lite/flake.lock
@@ -58,7 +58,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },

diff --git a/flakes/flake.lock b/flakes/flake.lock
index 3e5a0a01b5cc524b3fd9191279b88be9de98bcd3..d9fc0555d1a3aa920e84d0d60c2cae9831948b5c 100644 (file)
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3016,7 +3016,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3033,7 +3033,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3050,7 +3050,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3067,7 +3067,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3084,7 +3084,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3101,7 +3101,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3118,7 +3118,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3135,7 +3135,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3152,7 +3152,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3169,7 +3169,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3186,7 +3186,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3203,7 +3203,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3220,7 +3220,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3753,7 +3753,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zu5070QLfELfpNFnWS/4/MXSNad9RyYRbcPQzgInUEQ=",
+        "narHash": "sha256-60yr/wCF+U3z+wYR+UEgM+68nc4/CWkoIAjJsMpUG8c=",
         "path": "../systems/backup-2",
         "type": "path"
       },
@@ -3776,7 +3776,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Ad8zF+T8B7Xvbv72PnLeVojBKZxbISegAe2Oj157wjc=",
+        "narHash": "sha256-9geQj091r2/Sxi8/ghsp5mO8MIT/kT+nEL3PKgwuApc=",
         "path": "../systems/dilion",
         "type": "path"
       },
@@ -3824,7 +3824,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-IiNmTt+EL9aW6oEWp/JyUfjVLnLAu2MfX9e0b8J7/h0=",
+        "narHash": "sha256-MB/c+BVgQQ3qjAchd1Oe8qvg9UbFcY0xhxpj9RkEOnI=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3850,7 +3850,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-1LFmQtb2WYZgzgVLKMiOfWyysRubWGNElj/OSDMcYio=",
+        "narHash": "sha256-nV8j6HW6B93HEbeiy43tKCGV9J6xR7jIkAUZVbkKDt4=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3875,7 +3875,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-OhtanD0Sha8E1TSAdb2Za55EVOylpNHUhxGXn5JhfIU=",
+        "narHash": "sha256-4vXBjKeelh3z1l7ZYO0ucB2cZPuVJsYX7yZV3MDGqdk=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -3895,7 +3895,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-191b6BmFlc9NjTu9uVthcaXMQ5vbD5m0SNZEK2L5nBI=",
+        "narHash": "sha256-Xq8DqtsC5MIUnFBbK1YYSS+eEgqJTeIC7GgFeMs8dAc=",
         "path": "../systems/zoldene",
         "type": "path"
       },
@@ -7499,7 +7499,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7518,7 +7518,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7571,7 +7571,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=",
+        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
         "path": "../../flakes/etherpad-lite",
         "type": "path"
       },
@@ -7613,7 +7613,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=",
+        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
         "path": "../../flakes/grocy",
         "type": "path"
       },
@@ -7694,7 +7694,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../flakes/mypackages",
         "type": "path"
       },
@@ -7817,7 +7817,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=",
+        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
         "path": "../../flakes/surfer",
         "type": "path"
       },
@@ -7962,7 +7962,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=",
+        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
         "path": "./etherpad-lite",
         "type": "path"
       },
@@ -8004,7 +8004,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=",
+        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
         "path": "./grocy",
         "type": "path"
       },
@@ -8104,7 +8104,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "./mypackages",
         "type": "path"
       },
@@ -8409,7 +8409,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "./private/system",
         "type": "path"
       },
@@ -8451,7 +8451,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=",
+        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
         "path": "./surfer",
         "type": "path"
       },
@@ -9015,7 +9015,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9034,7 +9034,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9053,7 +9053,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9072,7 +9072,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },

diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock
index 85e09311a5f1e99d36aaec6080774c8f2cb5a25c..3e8cb41b9ddf903c478869b0824e302bcf07ae32 100644 (file)
--- a/flakes/grocy/flake.lock
+++ b/flakes/grocy/flake.lock
@@ -58,7 +58,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },

diff --git a/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix
index 942e32c0dbb83e99af8fc4aff64dca94efe7dc9d..f3d5be8d32fad85587e082d33a7db6885415d98a 100644 (file)
--- a/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix
+++ b/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix
@@ -1,4 +1,4 @@
-{ mantis_config ? "/etc/mantisbt/config_inc.php", stdenv, fetchurl, lib, callPackage}:
+{ mantis_config ? {}, stdenv, fetchurl, lib, callPackage}:
 let
   pluginNames = [ "slack" "source-integration" "taskodrome" "mantis-kanban" "tasks" ];
   allPlugins = lib.attrsets.genAttrs pluginNames
@@ -37,8 +37,7 @@ let
     #];
     installPhase = ''
     cp -a . $out
-    ln -s ${mantis_config} $out/config/config_inc.php
-    '';
+    '' + builtins.concatStringsSep "\n" (lib.mapAttrsToList (k: v: "ln -s ${v} $out/config/${k}.php") mantis_config);
 
     passthru = toPassthru package [];
   };

diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock
index e03f4e9bc8f1aa9b056f496e58a2e1e0c9636741..c6362c5b37a81353ab97411e847c050ba32336ef 100644 (file)
--- a/flakes/private/system/flake.lock
+++ b/flakes/private/system/flake.lock
@@ -69,7 +69,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },

diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock
index 92bddc68fee184197680c33ea64068a57af409b3..8ebbf92dd459e608d9fdb96bfce30e8e791d4a56 100644 (file)
--- a/flakes/surfer/flake.lock
+++ b/flakes/surfer/flake.lock
@@ -41,7 +41,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },

diff --git a/systems/backup-2/flake.lock b/systems/backup-2/flake.lock
index 4750406cfac096cf5acaa7d384fbb52a27300a12..dedbfb42c78fe9bfc31ef9d5b8139f3f4fae0005 100644 (file)
--- a/systems/backup-2/flake.lock
+++ b/systems/backup-2/flake.lock
@@ -425,7 +425,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -1104,7 +1104,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },

diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock
index c8e66383d463057ac0e1122803b7eea0ed302bc5..436b4bc60fbc8f03fff90ee6184a73c171de0ac1 100644 (file)
--- a/systems/dilion/flake.lock
+++ b/systems/dilion/flake.lock
@@ -243,7 +243,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -599,7 +599,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },

diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock
index 193ef5e69af6519e8c49092aabce28ef7ab31696..9d6c296bd8f62bac8131be5ecf55e2d2bda50441 100644 (file)
--- a/systems/eldiron/flake.lock
+++ b/systems/eldiron/flake.lock
@@ -813,7 +813,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -830,7 +830,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -847,7 +847,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -864,7 +864,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -2153,7 +2153,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -2206,7 +2206,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=",
+        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
         "path": "../../flakes/etherpad-lite",
         "type": "path"
       },
@@ -2248,7 +2248,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=",
+        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
         "path": "../../flakes/grocy",
         "type": "path"
       },
@@ -2329,7 +2329,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../flakes/mypackages",
         "type": "path"
       },
@@ -2440,7 +2440,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=",
+        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
         "path": "../../flakes/surfer",
         "type": "path"
       },

diff --git a/systems/eldiron/websites/git/mantisbt.nix b/systems/eldiron/websites/git/mantisbt.nix
index b0ee5535087c9f826d6162b34c969cc9c341ab3c..824e2e17e16cdc96bc07b2335ecb3b156b9e3543 100644 (file)
--- a/systems/eldiron/websites/git/mantisbt.nix
+++ b/systems/eldiron/websites/git/mantisbt.nix
@@ -1,4 +1,38 @@
-{ env, mantisbt_2, mantisbt_2-plugins, config }:
+{ env, mantisbt_2, mantisbt_2-plugins, config, writeText }:
+let
+  mantis_config = {
+    config_inc = config.secrets.fullPaths."webapps/tools-mantisbt";
+    custom_constants_inc = writeText "custom_constants_inc.php" ''
+      <?php
+      define('TESTING', 60);
+      ?>
+    '';
+    custom_strings_inc = writeText "custom_strings_inc.php" ''
+      <?php
+      switch( $g_active_language ) {
+        case 'french':
+          $s_status_enum_string = '10:nouveau,20:retour d’informations,30:reçu,40:confirmé,50:affecté,60:à tester,80:traité,90:fermé';
+          $s_acknowledged_bug_title = 'Recevoir l’anomalie';
+          $s_acknowledged_bug_button = 'Recevoir l’anomalie';
+          $s_email_notification_title_for_status_bug_acknowledged = 'L’anomalie suivante a été REÇUE.';
+
+          $s_testing_bug_title = "Mettre l’anomalie en test";
+          $s_testing_bug_button = 'À tester';
+          $s_email_notification_title_for_status_bug_testing = "L’anomalie suivante est prête à être TESTÉE.";
+          break;
+        default: # english
+          $s_status_enum_string = '10:new,20:feedback,30:acknowledged,40:confirmed,50:assigned,60:testing,80:resolved,90:closed';
+
+          $s_testing_bug_title = 'Mark issue Ready for Testing';
+          $s_testing_bug_button = 'Ready for Testing';
+
+          $s_email_notification_title_for_status_bug_testing = 'The following issue is ready for TESTING.';
+          break;
+      }
+      ?>
+    '';
+  };
+in
 rec {
   keys."webapps/tools-mantisbt" = {
     user = apache.user;
@@ -20,7 +54,8 @@ rec {
       $g_allow_anonymous_login = ON;
       $g_anonymous_account     = 'anonymous';
 
-      $g_phpMailer_method      = PHPMAILER_METHOD_SENDMAIL;
+      $g_log_level = LOG_EMAIL_VERBOSE;
+      $g_phpMailer_method      = PHPMAILER_METHOD_MAIL;
       $g_smtp_host             = 'localhost';
       $g_smtp_username         = ''';
       $g_smtp_password         = ''';
@@ -42,10 +77,12 @@ rec {
       $g_ldap_uid_field = 'uid';
       $g_ldap_realname_field = 'cn';
       $g_ldap_organization = '${env.ldap.filter}';
+
+      $g_status_enum_string = '10:new,20:feedback,30:acknowledged,40:confirmed,50:assigned,60:testing,80:resolved,90:closed';
+      $g_status_colors['testing'] = '#ace7ae';
     '';
   };
-  webRoot = (mantisbt_2.override { mantis_config =
-    config.secrets.fullPaths."webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration ]);
+  webRoot = (mantisbt_2.override { inherit mantis_config; }).withPlugins (p: [p.slack p.source-integration ]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
@@ -72,9 +109,8 @@ rec {
   };
   phpFpm = rec {
     serviceDeps = [ "postgresql.service" "openldap.service" ];
-    basedir = builtins.concatStringsSep ":" (
-      [ webRoot config.secrets.fullPaths."webapps/tools-mantisbt" ]
-      ++ webRoot.plugins);
+    basedir = builtins.concatStringsSep ":" ([ webRoot ] ++
+      webRoot.plugins ++ builtins.attrValues mantis_config);
     pool = {
       "listen.owner" = apache.user;
       "listen.group" = apache.group;
@@ -84,7 +120,8 @@ rec {
 
       "php_admin_value[upload_max_filesize]" = "5000000";
 
-      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
+      "php_admin_value[sendmail_path]" = "/run/wrappers/bin/sendmail -t -i";
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp:/run/wrappers/bin/sendmail";
       "php_admin_value[session.save_handler]" = "redis";
       "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Tools:MantisBT:'";
     };

diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock
index 1dc0e865a6e204603107e582c662437eca7c5f86..5330b72756bec671187e2b49678f3fcd90984e18 100644 (file)
--- a/systems/monitoring-1/flake.lock
+++ b/systems/monitoring-1/flake.lock
@@ -313,7 +313,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -735,7 +735,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },

diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock
index 95c61b828885e2c4b383abba8ffb366d6d3da7d9..e96c9fa807b07b94b191eb975121e5b0ad735d5e 100644 (file)
--- a/systems/quatresaisons/flake.lock
+++ b/systems/quatresaisons/flake.lock
@@ -291,7 +291,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -712,7 +712,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },

diff --git a/systems/zoldene/flake.lock b/systems/zoldene/flake.lock
index cbfadf43b76e4dae07217bea51d94a76f4ceafa5..638d3a0de3be86c87ddbcbb0b268dc1a6e0908ea 100644 (file)
--- a/systems/zoldene/flake.lock
+++ b/systems/zoldene/flake.lock
@@ -193,7 +193,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=",
+        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -455,7 +455,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=",
+        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },