X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fgit%2Fmantisbt%2Fmantisbt.nix;h=41c5e90a5c572848d23fd73615e90980d7536c77;hb=7f9bc878c96b4e40b72c907cded326fc6bdee38a;hp=00580b5a66a49945603ce7bf3f65921a945f3d4b;hpb=ec2a5ffb986e9b21dff31e16d112aa9052a4bc5c;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
index 00580b5..41c5e90 100644
--- a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
+++ b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
@@ -17,11 +17,11 @@ let
       });
     };
   in rec {
-    keys."tools-mantisbt" = {
-      destDir = "/run/keys/webapps";
+    keys = [{
+      dest = "webapps/tools-mantisbt";
       user = apache.user;
       group = apache.group;
-      permissions = "0700";
+      permissions = "0400";
       text = ''
         <?php
         $g_hostname              = '${env.postgresql.socket}';
@@ -56,7 +56,7 @@ let
         $g_ldap_realname_field = 'cn';
         $g_ldap_organization = '(memberOf=cn=users,cn=mantisbt,ou=services,dc=immae,dc=eu)';
       '';
-    };
+    }];
     webRoot = stdenv.mkDerivation rec {
       name = "mantisbt-${version}";
       version = "2.11.1";
@@ -72,7 +72,7 @@ let
         ];
       installPhase = ''
         cp -a . $out
-        ln -s /run/keys/webapps/tools-mantisbt $out/config/config_inc.php
+        ln -s /var/secrets/webapps/tools-mantisbt $out/config/config_inc.php
         ln -s ${plugins.slack} $out/plugins/Slack
         ln -s ${plugins.source-integration}/Source* $out/plugins/
       '';
@@ -102,9 +102,9 @@ let
         '';
     };
     phpFpm = rec {
-      serviceDeps = [ "postgresql.service" "openldap.service" "tools-mantisbt-key.service" ];
+      serviceDeps = [ "postgresql.service" "openldap.service" ];
       basedir = builtins.concatStringsSep ":" (
-        [ webRoot "/run/keys/webapps/tools-mantisbt" ]
+        [ webRoot "/var/secrets/webapps/tools-mantisbt" ]
         ++ lib.attrsets.mapAttrsToList (name: value: value) plugins);
       socket = "/var/run/phpfpm/mantisbt.sock";
       pool = ''
@@ -119,7 +119,7 @@ let
 
         php_admin_value[upload_max_filesize] = 5000000
 
-        php_admin_value[open_basedir] = "${basedir}:/tmp"
+        php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt"
         php_admin_value[session.save_path] = "/var/lib/php/sessions/mantisbt"
         '';
     };