X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fcommons%2Fadminer.nix;h=ab789b3919046d9c60c5d9238ea32102115247e9;hp=891046f97719588a7343d355deec52429035b57d;hb=b7d2d4e3da7da83bc7f133acaa216375890592b1;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a

diff --git a/nixops/modules/websites/commons/adminer.nix b/nixops/modules/websites/commons/adminer.nix
index 891046f..ab789b3 100644
--- a/nixops/modules/websites/commons/adminer.nix
+++ b/nixops/modules/websites/commons/adminer.nix
@@ -28,17 +28,20 @@ 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 = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "_adminer";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /adminer ${webRoot}
-        <Directory ${webRoot}>
+        Alias /adminer ${root}
+        <Directory ${root}>
           DirectoryIndex index.php
           Require all granted
           <FilesMatch "\.php$">