Add config for CI

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / tools / adminer.nix

diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index f8928417686aee2ada2dc9509192db51f422694c..c280684c2f9fcd919508f238ac3a3c85a442bb24 100644 (file)
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,17 +1,16 @@
-{ adminer, php74, forcePhpSocket ? null }:
+{ webapps, php74, 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;
+  webRoot = webapps.adminer;
   phpFpm = rec {
     user = apache.user;
     group = apache.group;
-    phpPackage = php74;
+    phpPackage = php74.withExtensions ({ enabled, all }: (lib.remove all.mysqli enabled) ++ [myPhpPackages.mysqli_pam]);
     settings = {
       "listen.owner" = apache.user;
       "listen.group" = apache.group;
@@ -21,20 +20,18 @@ 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 {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "_adminer";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
-      Alias /adminer ${root}
-      <Directory ${root}>
+      Alias /adminer ${webRoot}
+      <Directory ${webRoot}>
         DirectoryIndex index.php
         <FilesMatch "\.php$">
           SetHandler "proxy:unix:${if forcePhpSocket != null then forcePhpSocket else socket}|fcgi://localhost"