aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixops/modules/websites/commons/adminer.nix3
-rw-r--r--nixops/modules/websites/default.nix2
-rw-r--r--nixops/modules/websites/tools/dav/davical.nix2
-rw-r--r--nixops/modules/websites/tools/git/mantisbt/mantisbt.nix2
-rw-r--r--nixops/modules/websites/tools/tools/default.nix4
-rw-r--r--nixops/modules/websites/tools/tools/ldap.nix3
-rw-r--r--nixops/modules/websites/tools/tools/yourls.nix2
7 files changed, 12 insertions, 6 deletions
diff --git a/nixops/modules/websites/commons/adminer.nix b/nixops/modules/websites/commons/adminer.nix
index 9c4e132..ab789b3 100644
--- a/nixops/modules/websites/commons/adminer.nix
+++ b/nixops/modules/websites/commons/adminer.nix
@@ -28,8 +28,9 @@ let
28 ;php_admin_flag[log_errors] = on 28 ;php_admin_flag[log_errors] = on
29 ; Needed to avoid clashes in browser cookies (same domain) 29 ; Needed to avoid clashes in browser cookies (same domain)
30 php_value[session.name] = AdminerPHPSESSID 30 php_value[session.name] = AdminerPHPSESSID
31 php_admin_value[open_basedir] = "${webRoot}:/tmp" 31 php_admin_value[open_basedir] = "${webRoot}:/tmp:/var/lib/php/sessions/adminer:/var/lib/php/tmp/adminer"
32 php_admin_value[session.save_path] = "/var/lib/php/sessions/adminer" 32 php_admin_value[session.save_path] = "/var/lib/php/sessions/adminer"
33 php_admin_value[upload_tmp_dir] = "/var/lib/php/tmp/adminer"
33 ''; 34 '';
34 }; 35 };
35 apache = rec { 36 apache = rec {
diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index cd2b38a..927243b 100644
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -406,8 +406,10 @@ in
406 install -d -m 0755 /var/lib/acme/acme-challenge 406 install -d -m 0755 /var/lib/acme/acme-challenge
407 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions 407 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions
408 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/adminer 408 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/adminer
409 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/tmp/adminer
409 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt 410 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt
410 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/davical 411 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/davical
412 install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/phpldapadmin
411 ''; 413 '';
412 }; 414 };
413 415
diff --git a/nixops/modules/websites/tools/dav/davical.nix b/nixops/modules/websites/tools/dav/davical.nix
index 32f5483..89ba568 100644
--- a/nixops/modules/websites/tools/dav/davical.nix
+++ b/nixops/modules/websites/tools/dav/davical.nix
@@ -154,7 +154,7 @@ let
154 154
155 ; Needed to avoid clashes in browser cookies (same domain) 155 ; Needed to avoid clashes in browser cookies (same domain)
156 php_value[session.name] = DavicalPHPSESSID 156 php_value[session.name] = DavicalPHPSESSID
157 php_admin_value[open_basedir] = "${basedir}:/tmp" 157 php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/davical"
158 php_admin_value[include_path] = "${awl}/inc:${webapp}/inc" 158 php_admin_value[include_path] = "${awl}/inc:${webapp}/inc"
159 php_admin_value[session.save_path] = "/var/lib/php/sessions/davical" 159 php_admin_value[session.save_path] = "/var/lib/php/sessions/davical"
160 php_flag[magic_quotes_gpc] = Off 160 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 2c7422d..b564058 100644
--- a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
+++ b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
@@ -119,7 +119,7 @@ let
119 119
120 php_admin_value[upload_max_filesize] = 5000000 120 php_admin_value[upload_max_filesize] = 5000000
121 121
122 php_admin_value[open_basedir] = "${basedir}:/tmp" 122 php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt"
123 php_admin_value[session.save_path] = "/var/lib/php/sessions/mantisbt" 123 php_admin_value[session.save_path] = "/var/lib/php/sessions/mantisbt"
124 ''; 124 '';
125 }; 125 };
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index f51510f..2f34d27 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -150,7 +150,9 @@ in {
150 yourls = yourls.phpFpm.serviceDeps; 150 yourls = yourls.phpFpm.serviceDeps;
151 }; 151 };
152 152
153 services.myPhpfpm.poolPhpConfigs.roundcubemail = roundcubemail.phpFpm.phpConfig; 153 services.myPhpfpm.poolPhpConfigs = {
154 roundcubemail = roundcubemail.phpFpm.phpConfig;
155 };
154 services.myPhpfpm.poolConfigs = { 156 services.myPhpfpm.poolConfigs = {
155 adminer = adminer.phpFpm.pool; 157 adminer = adminer.phpFpm.pool;
156 ttrss = ttrss.phpFpm.pool; 158 ttrss = ttrss.phpFpm.pool;
diff --git a/nixops/modules/websites/tools/tools/ldap.nix b/nixops/modules/websites/tools/tools/ldap.nix
index 008dffe..623adb5 100644
--- a/nixops/modules/websites/tools/tools/ldap.nix
+++ b/nixops/modules/websites/tools/tools/ldap.nix
@@ -83,7 +83,8 @@ rec {
83 83
84 ; Needed to avoid clashes in browser cookies (same domain) 84 ; Needed to avoid clashes in browser cookies (same domain)
85 php_value[session.name] = LdapPHPSESSID 85 php_value[session.name] = LdapPHPSESSID
86 php_admin_value[open_basedir] = "${basedir}:/tmp" 86 php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/phpldapadmin"
87 php_admin_value[session.save_path] = "/var/lib/php/sessions/phpldapadmin"
87 ''; 88 '';
88 }; 89 };
89} 90}
diff --git a/nixops/modules/websites/tools/tools/yourls.nix b/nixops/modules/websites/tools/tools/yourls.nix
index e82856f..390dabe 100644
--- a/nixops/modules/websites/tools/tools/yourls.nix
+++ b/nixops/modules/websites/tools/tools/yourls.nix
@@ -102,7 +102,7 @@ let
102 102
103 ; Needed to avoid clashes in browser cookies (same domain) 103 ; Needed to avoid clashes in browser cookies (same domain)
104 php_value[session.name] = YourlsPHPSESSID 104 php_value[session.name] = YourlsPHPSESSID
105 php_admin_value[open_basedir] = "${basedir}:/tmp" 105 php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/yourls"
106 php_admin_value[session.save_path] = "/var/lib/php/sessions/yourls" 106 php_admin_value[session.save_path] = "/var/lib/php/sessions/yourls"
107 ''; 107 '';
108 }; 108 };