From 21ef5f88af1a19ac2419c225b2ecaabc8ccd3d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 8 Jul 2024 10:16:20 +0200 Subject: [PATCH] install correct php yaml extension version --- modules/nixos-wiki/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/nixos-wiki/default.nix b/modules/nixos-wiki/default.nix index 85fe758..0b0cbe5 100644 --- a/modules/nixos-wiki/default.nix +++ b/modules/nixos-wiki/default.nix @@ -173,9 +173,14 @@ in }; # https://www.mediawiki.org/wiki/Help:Extension:Translate/Installation - services.phpfpm.pools.mediawiki.phpOptions = '' - extension=${pkgs.phpExtensions.yaml}/lib/php/extensions/yaml.so - ''; + services.phpfpm.pools.mediawiki.phpOptions = + let + phpVersion = builtins.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor config.services.phpfpm.pools.mediawiki.phpPackage.version); + extensions = pkgs."php${phpVersion}Extensions"; + in + '' + extension=${extensions.yaml}/lib/php/extensions/yaml.so + ''; services.postgresql.package = pkgs.postgresql_16; @@ -195,6 +200,9 @@ in touch /var/lib/mediawiki/.mediawiki-job-index-fix fi ''; + systemd.services.mediawiki-init.serviceConfig.RemainAfterExit = true; + + networking.firewall.allowedTCPPorts = [ 443 80 ]; security.acme.acceptTerms = true;