X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fadminer.nix;h=af03550b5b6f085ee7f14f32f76e79754694c453;hb=68c45ad53b34301c1a0c59352a839db13e1f2420;hp=f8928417686aee2ada2dc9509192db51f422694c;hpb=c0d1c186b7811daaebea87563978c426856f28d0;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index f892841..af03550 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,17 +1,16 @@
-{ adminer, php74, forcePhpSocket ? null }:
+{ adminer, php74, php74base, myPhpPackages, lib, forcePhpSocket ? null }:
 rec {
   activationScript = {
     deps = [ "httpd" ];
     text = ''
       install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/adminer
-      install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/tmp/adminer
       '';
   };
   webRoot = adminer;
   phpFpm = rec {
     user = apache.user;
     group = apache.group;
-    phpPackage = php74;
+    phpPackage = php74base.withExtensions (e: (lib.remove e.mysqli php74.enabledExtensions) ++ [myPhpPackages.mysqli_pam]);
     settings = {
       "listen.owner" = apache.user;
       "listen.group" = apache.group;
@@ -21,9 +20,8 @@ rec {
       #"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:/var/lib/php/sessions/adminer:/var/lib/php/tmp/adminer";
+      "php_admin_value[open_basedir]" = "${webRoot}:/tmp:/var/lib/php/sessions/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 {