diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-08-03 00:33:10 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-08-03 00:37:20 +0200 |
commit | 2887cca3e2aaf392bb405fe3b14f6eaad726d72d (patch) | |
tree | bf29631d732b3bfc5d3d95f915fc6b4ee3a1cce0 /systems | |
parent | c55a138ea7448b26940ee9ba1c5853b0292a19d5 (diff) | |
download | Nix-2887cca3e2aaf392bb405fe3b14f6eaad726d72d.tar.gz Nix-2887cca3e2aaf392bb405fe3b14f6eaad726d72d.tar.zst Nix-2887cca3e2aaf392bb405fe3b14f6eaad726d72d.zip |
Fix e-mails for mantisbt
Diffstat (limited to 'systems')
-rw-r--r-- | systems/backup-2/flake.lock | 4 | ||||
-rw-r--r-- | systems/dilion/flake.lock | 4 | ||||
-rw-r--r-- | systems/eldiron/flake.lock | 18 | ||||
-rw-r--r-- | systems/eldiron/websites/git/mantisbt.nix | 53 | ||||
-rw-r--r-- | systems/monitoring-1/flake.lock | 4 | ||||
-rw-r--r-- | systems/quatresaisons/flake.lock | 4 | ||||
-rw-r--r-- | systems/zoldene/flake.lock | 4 |
7 files changed, 64 insertions, 27 deletions
diff --git a/systems/backup-2/flake.lock b/systems/backup-2/flake.lock index 4750406..dedbfb4 100644 --- a/systems/backup-2/flake.lock +++ b/systems/backup-2/flake.lock | |||
@@ -425,7 +425,7 @@ | |||
425 | }, | 425 | }, |
426 | "locked": { | 426 | "locked": { |
427 | "lastModified": 1, | 427 | "lastModified": 1, |
428 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 428 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
429 | "path": "../../mypackages", | 429 | "path": "../../mypackages", |
430 | "type": "path" | 430 | "type": "path" |
431 | }, | 431 | }, |
@@ -1104,7 +1104,7 @@ | |||
1104 | }, | 1104 | }, |
1105 | "locked": { | 1105 | "locked": { |
1106 | "lastModified": 1, | 1106 | "lastModified": 1, |
1107 | "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=", | 1107 | "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", |
1108 | "path": "../../flakes/private/system", | 1108 | "path": "../../flakes/private/system", |
1109 | "type": "path" | 1109 | "type": "path" |
1110 | }, | 1110 | }, |
diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock index c8e6638..436b4bc 100644 --- a/systems/dilion/flake.lock +++ b/systems/dilion/flake.lock | |||
@@ -243,7 +243,7 @@ | |||
243 | }, | 243 | }, |
244 | "locked": { | 244 | "locked": { |
245 | "lastModified": 1, | 245 | "lastModified": 1, |
246 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 246 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
247 | "path": "../../mypackages", | 247 | "path": "../../mypackages", |
248 | "type": "path" | 248 | "type": "path" |
249 | }, | 249 | }, |
@@ -599,7 +599,7 @@ | |||
599 | }, | 599 | }, |
600 | "locked": { | 600 | "locked": { |
601 | "lastModified": 1, | 601 | "lastModified": 1, |
602 | "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=", | 602 | "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", |
603 | "path": "../../flakes/private/system", | 603 | "path": "../../flakes/private/system", |
604 | "type": "path" | 604 | "type": "path" |
605 | }, | 605 | }, |
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock index 193ef5e..9d6c296 100644 --- a/systems/eldiron/flake.lock +++ b/systems/eldiron/flake.lock | |||
@@ -813,7 +813,7 @@ | |||
813 | }, | 813 | }, |
814 | "locked": { | 814 | "locked": { |
815 | "lastModified": 1, | 815 | "lastModified": 1, |
816 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 816 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
817 | "path": "../../mypackages", | 817 | "path": "../../mypackages", |
818 | "type": "path" | 818 | "type": "path" |
819 | }, | 819 | }, |
@@ -830,7 +830,7 @@ | |||
830 | }, | 830 | }, |
831 | "locked": { | 831 | "locked": { |
832 | "lastModified": 1, | 832 | "lastModified": 1, |
833 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 833 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
834 | "path": "../mypackages", | 834 | "path": "../mypackages", |
835 | "type": "path" | 835 | "type": "path" |
836 | }, | 836 | }, |
@@ -847,7 +847,7 @@ | |||
847 | }, | 847 | }, |
848 | "locked": { | 848 | "locked": { |
849 | "lastModified": 1, | 849 | "lastModified": 1, |
850 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 850 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
851 | "path": "../mypackages", | 851 | "path": "../mypackages", |
852 | "type": "path" | 852 | "type": "path" |
853 | }, | 853 | }, |
@@ -864,7 +864,7 @@ | |||
864 | }, | 864 | }, |
865 | "locked": { | 865 | "locked": { |
866 | "lastModified": 1, | 866 | "lastModified": 1, |
867 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 867 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
868 | "path": "../mypackages", | 868 | "path": "../mypackages", |
869 | "type": "path" | 869 | "type": "path" |
870 | }, | 870 | }, |
@@ -2153,7 +2153,7 @@ | |||
2153 | }, | 2153 | }, |
2154 | "locked": { | 2154 | "locked": { |
2155 | "lastModified": 1, | 2155 | "lastModified": 1, |
2156 | "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=", | 2156 | "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", |
2157 | "path": "../../flakes/private/system", | 2157 | "path": "../../flakes/private/system", |
2158 | "type": "path" | 2158 | "type": "path" |
2159 | }, | 2159 | }, |
@@ -2206,7 +2206,7 @@ | |||
2206 | }, | 2206 | }, |
2207 | "locked": { | 2207 | "locked": { |
2208 | "lastModified": 1, | 2208 | "lastModified": 1, |
2209 | "narHash": "sha256-3jBcul1HygZm8wcM5jC/sUHZ5YtqJ9tFVHfcLkkcA5o=", | 2209 | "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", |
2210 | "path": "../../flakes/etherpad-lite", | 2210 | "path": "../../flakes/etherpad-lite", |
2211 | "type": "path" | 2211 | "type": "path" |
2212 | }, | 2212 | }, |
@@ -2248,7 +2248,7 @@ | |||
2248 | }, | 2248 | }, |
2249 | "locked": { | 2249 | "locked": { |
2250 | "lastModified": 1, | 2250 | "lastModified": 1, |
2251 | "narHash": "sha256-XCx9WCDeZBKnXW6bKGwuQkRo20o8QY9H1bDGWeuvz2Y=", | 2251 | "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", |
2252 | "path": "../../flakes/grocy", | 2252 | "path": "../../flakes/grocy", |
2253 | "type": "path" | 2253 | "type": "path" |
2254 | }, | 2254 | }, |
@@ -2329,7 +2329,7 @@ | |||
2329 | }, | 2329 | }, |
2330 | "locked": { | 2330 | "locked": { |
2331 | "lastModified": 1, | 2331 | "lastModified": 1, |
2332 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 2332 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
2333 | "path": "../../flakes/mypackages", | 2333 | "path": "../../flakes/mypackages", |
2334 | "type": "path" | 2334 | "type": "path" |
2335 | }, | 2335 | }, |
@@ -2440,7 +2440,7 @@ | |||
2440 | }, | 2440 | }, |
2441 | "locked": { | 2441 | "locked": { |
2442 | "lastModified": 1, | 2442 | "lastModified": 1, |
2443 | "narHash": "sha256-TGXBCAl2v69YQq5ucXMaoqh8er1R2mnmxz9xt4oYS/Y=", | 2443 | "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", |
2444 | "path": "../../flakes/surfer", | 2444 | "path": "../../flakes/surfer", |
2445 | "type": "path" | 2445 | "type": "path" |
2446 | }, | 2446 | }, |
diff --git a/systems/eldiron/websites/git/mantisbt.nix b/systems/eldiron/websites/git/mantisbt.nix index b0ee553..824e2e1 100644 --- a/systems/eldiron/websites/git/mantisbt.nix +++ b/systems/eldiron/websites/git/mantisbt.nix | |||
@@ -1,4 +1,38 @@ | |||
1 | { env, mantisbt_2, mantisbt_2-plugins, config }: | 1 | { env, mantisbt_2, mantisbt_2-plugins, config, writeText }: |
2 | let | ||
3 | mantis_config = { | ||
4 | config_inc = config.secrets.fullPaths."webapps/tools-mantisbt"; | ||
5 | custom_constants_inc = writeText "custom_constants_inc.php" '' | ||
6 | <?php | ||
7 | define('TESTING', 60); | ||
8 | ?> | ||
9 | ''; | ||
10 | custom_strings_inc = writeText "custom_strings_inc.php" '' | ||
11 | <?php | ||
12 | switch( $g_active_language ) { | ||
13 | case 'french': | ||
14 | $s_status_enum_string = '10:nouveau,20:retour d’informations,30:reçu,40:confirmé,50:affecté,60:à tester,80:traité,90:fermé'; | ||
15 | $s_acknowledged_bug_title = 'Recevoir l’anomalie'; | ||
16 | $s_acknowledged_bug_button = 'Recevoir l’anomalie'; | ||
17 | $s_email_notification_title_for_status_bug_acknowledged = 'L’anomalie suivante a été REÇUE.'; | ||
18 | |||
19 | $s_testing_bug_title = "Mettre l’anomalie en test"; | ||
20 | $s_testing_bug_button = 'À tester'; | ||
21 | $s_email_notification_title_for_status_bug_testing = "L’anomalie suivante est prête à être TESTÉE."; | ||
22 | break; | ||
23 | default: # english | ||
24 | $s_status_enum_string = '10:new,20:feedback,30:acknowledged,40:confirmed,50:assigned,60:testing,80:resolved,90:closed'; | ||
25 | |||
26 | $s_testing_bug_title = 'Mark issue Ready for Testing'; | ||
27 | $s_testing_bug_button = 'Ready for Testing'; | ||
28 | |||
29 | $s_email_notification_title_for_status_bug_testing = 'The following issue is ready for TESTING.'; | ||
30 | break; | ||
31 | } | ||
32 | ?> | ||
33 | ''; | ||
34 | }; | ||
35 | in | ||
2 | rec { | 36 | rec { |
3 | keys."webapps/tools-mantisbt" = { | 37 | keys."webapps/tools-mantisbt" = { |
4 | user = apache.user; | 38 | user = apache.user; |
@@ -20,7 +54,8 @@ rec { | |||
20 | $g_allow_anonymous_login = ON; | 54 | $g_allow_anonymous_login = ON; |
21 | $g_anonymous_account = 'anonymous'; | 55 | $g_anonymous_account = 'anonymous'; |
22 | 56 | ||
23 | $g_phpMailer_method = PHPMAILER_METHOD_SENDMAIL; | 57 | $g_log_level = LOG_EMAIL_VERBOSE; |
58 | $g_phpMailer_method = PHPMAILER_METHOD_MAIL; | ||
24 | $g_smtp_host = 'localhost'; | 59 | $g_smtp_host = 'localhost'; |
25 | $g_smtp_username = '''; | 60 | $g_smtp_username = '''; |
26 | $g_smtp_password = '''; | 61 | $g_smtp_password = '''; |
@@ -42,10 +77,12 @@ rec { | |||
42 | $g_ldap_uid_field = 'uid'; | 77 | $g_ldap_uid_field = 'uid'; |
43 | $g_ldap_realname_field = 'cn'; | 78 | $g_ldap_realname_field = 'cn'; |
44 | $g_ldap_organization = '${env.ldap.filter}'; | 79 | $g_ldap_organization = '${env.ldap.filter}'; |
80 | |||
81 | $g_status_enum_string = '10:new,20:feedback,30:acknowledged,40:confirmed,50:assigned,60:testing,80:resolved,90:closed'; | ||
82 | $g_status_colors['testing'] = '#ace7ae'; | ||
45 | ''; | 83 | ''; |
46 | }; | 84 | }; |
47 | webRoot = (mantisbt_2.override { mantis_config = | 85 | webRoot = (mantisbt_2.override { inherit mantis_config; }).withPlugins (p: [p.slack p.source-integration ]); |
48 | config.secrets.fullPaths."webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration ]); | ||
49 | apache = rec { | 86 | apache = rec { |
50 | user = "wwwrun"; | 87 | user = "wwwrun"; |
51 | group = "wwwrun"; | 88 | group = "wwwrun"; |
@@ -72,9 +109,8 @@ rec { | |||
72 | }; | 109 | }; |
73 | phpFpm = rec { | 110 | phpFpm = rec { |
74 | serviceDeps = [ "postgresql.service" "openldap.service" ]; | 111 | serviceDeps = [ "postgresql.service" "openldap.service" ]; |
75 | basedir = builtins.concatStringsSep ":" ( | 112 | basedir = builtins.concatStringsSep ":" ([ webRoot ] ++ |
76 | [ webRoot config.secrets.fullPaths."webapps/tools-mantisbt" ] | 113 | webRoot.plugins ++ builtins.attrValues mantis_config); |
77 | ++ webRoot.plugins); | ||
78 | pool = { | 114 | pool = { |
79 | "listen.owner" = apache.user; | 115 | "listen.owner" = apache.user; |
80 | "listen.group" = apache.group; | 116 | "listen.group" = apache.group; |
@@ -84,7 +120,8 @@ rec { | |||
84 | 120 | ||
85 | "php_admin_value[upload_max_filesize]" = "5000000"; | 121 | "php_admin_value[upload_max_filesize]" = "5000000"; |
86 | 122 | ||
87 | "php_admin_value[open_basedir]" = "${basedir}:/tmp"; | 123 | "php_admin_value[sendmail_path]" = "/run/wrappers/bin/sendmail -t -i"; |
124 | "php_admin_value[open_basedir]" = "${basedir}:/tmp:/run/wrappers/bin/sendmail"; | ||
88 | "php_admin_value[session.save_handler]" = "redis"; | 125 | "php_admin_value[session.save_handler]" = "redis"; |
89 | "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Tools:MantisBT:'"; | 126 | "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Tools:MantisBT:'"; |
90 | }; | 127 | }; |
diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock index 1dc0e86..5330b72 100644 --- a/systems/monitoring-1/flake.lock +++ b/systems/monitoring-1/flake.lock | |||
@@ -313,7 +313,7 @@ | |||
313 | }, | 313 | }, |
314 | "locked": { | 314 | "locked": { |
315 | "lastModified": 1, | 315 | "lastModified": 1, |
316 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 316 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
317 | "path": "../../mypackages", | 317 | "path": "../../mypackages", |
318 | "type": "path" | 318 | "type": "path" |
319 | }, | 319 | }, |
@@ -735,7 +735,7 @@ | |||
735 | }, | 735 | }, |
736 | "locked": { | 736 | "locked": { |
737 | "lastModified": 1, | 737 | "lastModified": 1, |
738 | "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=", | 738 | "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", |
739 | "path": "../../flakes/private/system", | 739 | "path": "../../flakes/private/system", |
740 | "type": "path" | 740 | "type": "path" |
741 | }, | 741 | }, |
diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock index 95c61b8..e96c9fa 100644 --- a/systems/quatresaisons/flake.lock +++ b/systems/quatresaisons/flake.lock | |||
@@ -291,7 +291,7 @@ | |||
291 | }, | 291 | }, |
292 | "locked": { | 292 | "locked": { |
293 | "lastModified": 1, | 293 | "lastModified": 1, |
294 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 294 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
295 | "path": "../../mypackages", | 295 | "path": "../../mypackages", |
296 | "type": "path" | 296 | "type": "path" |
297 | }, | 297 | }, |
@@ -712,7 +712,7 @@ | |||
712 | }, | 712 | }, |
713 | "locked": { | 713 | "locked": { |
714 | "lastModified": 1, | 714 | "lastModified": 1, |
715 | "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=", | 715 | "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", |
716 | "path": "../../flakes/private/system", | 716 | "path": "../../flakes/private/system", |
717 | "type": "path" | 717 | "type": "path" |
718 | }, | 718 | }, |
diff --git a/systems/zoldene/flake.lock b/systems/zoldene/flake.lock index cbfadf4..638d3a0 100644 --- a/systems/zoldene/flake.lock +++ b/systems/zoldene/flake.lock | |||
@@ -193,7 +193,7 @@ | |||
193 | }, | 193 | }, |
194 | "locked": { | 194 | "locked": { |
195 | "lastModified": 1, | 195 | "lastModified": 1, |
196 | "narHash": "sha256-0u2hGR7yEILkNAzKlYiajJNV+ZL39+6HFhJzLwvoE6E=", | 196 | "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", |
197 | "path": "../../mypackages", | 197 | "path": "../../mypackages", |
198 | "type": "path" | 198 | "type": "path" |
199 | }, | 199 | }, |
@@ -455,7 +455,7 @@ | |||
455 | }, | 455 | }, |
456 | "locked": { | 456 | "locked": { |
457 | "lastModified": 1, | 457 | "lastModified": 1, |
458 | "narHash": "sha256-zbQxRzS3bTCQO/0D/AJYNU/xwBmXgfU82PDLxVyXcAQ=", | 458 | "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", |
459 | "path": "../../flakes/private/system", | 459 | "path": "../../flakes/private/system", |
460 | "type": "path" | 460 | "type": "path" |
461 | }, | 461 | }, |