Merge branch 'main' into hosts-v2

flake.lock

@@ -50,11 +50,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1787559586,
+        "lastModified": 1788450739,
-        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787848966,
+        "lastModified": 1789542786,
-        "narHash": "sha256-7gDpu5hpq0rOYnYMcOWqSzquK4HA/xU8Xf3CjUBOOJA=",
+        "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d57af924f160a5084293c71c2043f058bd1cdb60",
+        "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1785031560,
+        "lastModified": 1788057806,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
         "type": "github"
       },
       "original": {

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";

hosts/vm/neo/matrix.nix

@@ -134,7 +134,11 @@
         "/var/lib/matrix-appservice-irc/registration.yml"
       ];
 
-      auto_join_rooms = [ "#root-space:crans.org" ];
+      auto_join_rooms = [
+        "#crans:crans.org"
+        "#general:crans.org"
+        "#root-space:crans.org"
+      ];
 
       # https://element-hq.github.io/synapse/latest/server_notices.html
       server_notices = {