Merge branch 'wiki' into 'main'

Wiki fix php

See merge request nounous/nixos!91

hosts/vm/mediakiwi/mediawiki.nix

@@ -5,7 +5,17 @@
 }:
 
 let
-  phpExtensions = config.services.mediawiki.phpPackage.extensions;
+  # https://www.mediawiki.org/wiki/Compatibility#PHP
+  php = pkgs.php83.buildEnv {
+    extensions =
+      { all, enabled }:
+      enabled
+      ++ (with all; [
+        apcu
+        imagick
+        luasandbox
+      ]);
+  };
 in
 {
   # Mauvaise config posgresql, on fixe à la mano temporairement
@@ -50,8 +60,6 @@ in
     max_execution_time = 1000
     max_input_time = 2000
     default_socket_timeout = 2000
-    extension = ${phpExtensions.mbstring}/lib/php/extensions/mbstring.so
-    extension = ${phpExtensions.luasandbox}/lib/php/extensions/luasandbox.so
   '';
 
   services.nginx.clientMaxBodySize = "512M";
@@ -63,9 +71,8 @@ in
     let
       # Hack pour retrouver la conf
       conf = config.services.phpfpm.pools.mediawiki.phpEnv.MEDIAWIKI_CONFIG;
-      php = "${config.services.mediawiki.phpPackage}/bin/php";
       maintenanceScript = "${config.services.mediawiki.finalPackage}/share/mediawiki/maintenance/run.php";
-      runJobs = "MEDIAWIKI_CONFIG='${conf}' ${php} ${maintenanceScript} runJobs --maxtime=3600";
+      runJobs = "MEDIAWIKI_CONFIG='${conf}' ${php}/bin/php ${maintenanceScript} runJobs --maxtime=3600";
     in
     {
       description = "Tâches lourdes de Mediawiki";
@@ -99,6 +106,7 @@ in
 
     name = "Wiki Crans";
 
+    phpPackage = php;
     nginx.hostName = "mediawiki.crans.org";
 
     webserver = "nginx";