diff options
Diffstat (limited to 'systems/eldiron')
-rw-r--r-- | systems/eldiron/flake.lock | 18 | ||||
-rw-r--r-- | systems/eldiron/websites/git/mantisbt.nix | 8 |
2 files changed, 16 insertions, 10 deletions
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock index 58291c5..79900ed 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-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=", | 816 | "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", |
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-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=", | 833 | "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", |
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-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=", | 850 | "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", |
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-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=", | 867 | "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", |
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-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=", | 2156 | "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", |
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-0RN3EjVLumRs4/CYgYA1+UQecq+LyzrUJI6SpGHN/50=", | 2209 | "narHash": "sha256-WmYq012p6U6KrAR1G+zyto8x0iCNqBMHmMgcdHu2o1o=", |
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-0j7YmFwrbLg3FKeAcZApJ240cpt6uhiEEZt5v52QN5Q=", | 2251 | "narHash": "sha256-OziOtTgYe7QbdiOLjPcBLLAfBX9HXaEeTiw1yCZFyTI=", |
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-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=", | 2332 | "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", |
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-SaZuUdU7estQQxxOhZ0mRyaQHK3AnlCUo/lTP8MFBao=", | 2443 | "narHash": "sha256-PnXbm79feLDlquMaAFoevudYnu2deMutFLbpzd1/XxA=", |
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 3bd78e1..b0ee553 100644 --- a/systems/eldiron/websites/git/mantisbt.nix +++ b/systems/eldiron/websites/git/mantisbt.nix | |||
@@ -6,6 +6,10 @@ rec { | |||
6 | permissions = "0400"; | 6 | permissions = "0400"; |
7 | text = '' | 7 | text = '' |
8 | <?php | 8 | <?php |
9 | $g_admin_checks = OFF; | ||
10 | $g_reauthentication = OFF; | ||
11 | $g_reauthentication_expiry = 604800; | ||
12 | $g_path = 'https://git.immae.eu/mantisbt/'; | ||
9 | $g_hostname = '${env.postgresql.socket}'; | 13 | $g_hostname = '${env.postgresql.socket}'; |
10 | $g_db_username = '${env.postgresql.user}'; | 14 | $g_db_username = '${env.postgresql.user}'; |
11 | $g_db_password = '${env.postgresql.password}'; | 15 | $g_db_password = '${env.postgresql.password}'; |
@@ -29,6 +33,7 @@ rec { | |||
29 | $g_login_method = LDAP; | 33 | $g_login_method = LDAP; |
30 | $g_ldap_protocol_version = 3; | 34 | $g_ldap_protocol_version = 3; |
31 | $g_ldap_server = 'ldaps://${env.ldap.host}:636'; | 35 | $g_ldap_server = 'ldaps://${env.ldap.host}:636'; |
36 | $g_ldap_use_starttls = OFF; | ||
32 | $g_ldap_root_dn = 'ou=users,${env.ldap.base}'; | 37 | $g_ldap_root_dn = 'ou=users,${env.ldap.base}'; |
33 | $g_ldap_bind_dn = '${env.ldap.dn}'; | 38 | $g_ldap_bind_dn = '${env.ldap.dn}'; |
34 | $g_ldap_bind_passwd = '${env.ldap.password}'; | 39 | $g_ldap_bind_passwd = '${env.ldap.password}'; |
@@ -39,7 +44,8 @@ rec { | |||
39 | $g_ldap_organization = '${env.ldap.filter}'; | 44 | $g_ldap_organization = '${env.ldap.filter}'; |
40 | ''; | 45 | ''; |
41 | }; | 46 | }; |
42 | webRoot = (mantisbt_2.override { mantis_config = config.secrets.fullPaths."webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration]); | 47 | webRoot = (mantisbt_2.override { mantis_config = |
48 | config.secrets.fullPaths."webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration ]); | ||
43 | apache = rec { | 49 | apache = rec { |
44 | user = "wwwrun"; | 50 | user = "wwwrun"; |
45 | group = "wwwrun"; | 51 | group = "wwwrun"; |