Cleanup php session directories

diff --git a/nixops/modules/websites/commons/adminer.nix b/nixops/modules/websites/commons/adminer.nix
index 9c4e13297e7ade65f5e7d61154415eb9658ff2d3..ab789b3919046d9c60c5d9238ea32102115247e9 100644 (file)
--- a/nixops/modules/websites/commons/adminer.nix
+++ b/nixops/modules/websites/commons/adminer.nix
@@ -28,8 +28,9 @@ let
         ;php_admin_flag[log_errors] = on
         ; Needed to avoid clashes in browser cookies (same domain)
         php_value[session.name] = AdminerPHPSESSID
-        php_admin_value[open_basedir] = "${webRoot}:/tmp"
+        php_admin_value[open_basedir] = "${webRoot}:/tmp:/var/lib/php/sessions/adminer:/var/lib/php/tmp/adminer"
         php_admin_value[session.save_path] = "/var/lib/php/sessions/adminer"
+        php_admin_value[upload_tmp_dir] = "/var/lib/php/tmp/adminer"
         '';
     };
     apache = rec {

diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index cd2b38aefecc95a4a7160bc329e8b45e08c179fe..927243b2e31cb31da62d594528db42690ff3db67 100644 (file)
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -406,8 +406,10 @@ in
         install -d -m 0755 /var/lib/acme/acme-challenge
         install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions
         install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/adminer
+        install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/tmp/adminer
         install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt
         install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/davical
+        install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/phpldapadmin
         '';
     };
 

diff --git a/nixops/modules/websites/tools/dav/davical.nix b/nixops/modules/websites/tools/dav/davical.nix
index 32f548398b3d24fbf51869f371945ebe78490a82..89ba5683ce630b8649d9ca3c2fcf560e577bc6f5 100644 (file)
--- a/nixops/modules/websites/tools/dav/davical.nix
+++ b/nixops/modules/websites/tools/dav/davical.nix
@@ -154,7 +154,7 @@ let
 
         ; Needed to avoid clashes in browser cookies (same domain)
         php_value[session.name] = DavicalPHPSESSID
-        php_admin_value[open_basedir] = "${basedir}:/tmp"
+        php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/davical"
         php_admin_value[include_path] = "${awl}/inc:${webapp}/inc"
         php_admin_value[session.save_path] = "/var/lib/php/sessions/davical"
         php_flag[magic_quotes_gpc] = Off

diff --git a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
index 2c7422def9554f5bee308b785e58759a551637f0..b564058c067db6bab7ed86107090e5d3c508f6e3 100644 (file)
--- a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
+++ b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
@@ -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"
         '';
     };

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index f51510ff614668c522f44acbd39bf264ac146fa4..2f34d27f48ed58396f3a94db5b73247d0c613e8c 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -150,7 +150,9 @@ in {
       yourls = yourls.phpFpm.serviceDeps;
     };
 
-    services.myPhpfpm.poolPhpConfigs.roundcubemail = roundcubemail.phpFpm.phpConfig;
+    services.myPhpfpm.poolPhpConfigs = {
+      roundcubemail = roundcubemail.phpFpm.phpConfig;
+    };
     services.myPhpfpm.poolConfigs = {
       adminer = adminer.phpFpm.pool;
       ttrss = ttrss.phpFpm.pool;

diff --git a/nixops/modules/websites/tools/tools/ldap.nix b/nixops/modules/websites/tools/tools/ldap.nix
index 008dffe211b3a1aa591bb673902d2343dab86513..623adb581594a381c2cfba2a5a4d9b5416d3bd37 100644 (file)
--- a/nixops/modules/websites/tools/tools/ldap.nix
+++ b/nixops/modules/websites/tools/tools/ldap.nix
@@ -83,7 +83,8 @@ rec {
 
       ; Needed to avoid clashes in browser cookies (same domain)
       php_value[session.name] = LdapPHPSESSID
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
+      php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/phpldapadmin"
+      php_admin_value[session.save_path] = "/var/lib/php/sessions/phpldapadmin"
       '';
   };
 }

diff --git a/nixops/modules/websites/tools/tools/yourls.nix b/nixops/modules/websites/tools/tools/yourls.nix
index e82856f2f3440ba84a63317346c48f7e1b611c0c..390dabe081e82ccf8a9c45311d82ead0e3eb0782 100644 (file)
--- a/nixops/modules/websites/tools/tools/yourls.nix
+++ b/nixops/modules/websites/tools/tools/yourls.nix
@@ -102,7 +102,7 @@ let
 
         ; Needed to avoid clashes in browser cookies (same domain)
         php_value[session.name] = YourlsPHPSESSID
-        php_admin_value[open_basedir] = "${basedir}:/tmp"
+        php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/yourls"
         php_admin_value[session.save_path] = "/var/lib/php/sessions/yourls"
         '';
     };