X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fadminer.nix;h=61fd37c867d72813007e58a571b0ee7888ce0152;hb=27b4bbf9ad21d511c5a2e96d0723f2a65e1118a1;hp=52a132c5ed30e22862a2eada33d8ed9960fab917;hpb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;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 52a132c..61fd37c 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,28 +1,16 @@
-{ adminer, php73, forcePhpSocket ? null }:
+{ adminer, php74, 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 = (php73.override {
-      config.php.mysqlnd = true;
-      config.php.mysqli = false;
-      config.php.pdo-mysql = false;
-    }).overrideAttrs(old: rec {
-      configureFlags = old.configureFlags ++ [
-        "--with-mysqli=shared,mysqlnd"
-        ];
-    });
-    phpOptions = ''
-      extension=${phpPackage}/lib/php/extensions/mysqli.so
-    '';
+    phpPackage = php74;
     settings = {
       "listen.owner" = apache.user;
       "listen.group" = apache.group;
@@ -32,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 {