Update dokuwiki service config

services/dokuwiki.nix

@@ -13,57 +13,6 @@
   fpm_cfg = config.services.phpfpm.pools.${fpm_pool};
   dw_domain = "wiki.${baseDomain}";
 
-  # Comming from Nextcloud module
-  # Using opcache to cache the php-files in a precompiled state and thus better performance
-  phpOptions = {
-    expose_php = "Off";
-    "opcache.interned_strings_buffer" = "8";
-    "opcache.max_accelerated_files" = "10000";
-    "opcache.memory_consumption" = "64";
-    "opcache.revalidate_freq" = "15";
-    "opcache.fast_shutdown" = "1";
-  };
-  phpPackage = pkgs.php81.buildEnv {
-    extraConfig = toKeyValue phpOptions;
-  };
-  toKeyValue = with lib;
-    generators.toKeyValue {
-      mkKeyValue = generators.mkKeyValueDefault {} " = ";
-    };
-
-  # Taken
-  mkPHPValue = v: let
-    isHasAttr = s: isAttrs v && hasAttr s v;
-  in
-    if isString v
-    then escapeShellArg v
-    # NOTE: If any value contains a , (comma) this will not get escaped
-    else if isList v && any lib.strings.isCoercibleToString v
-    then escapeShellArg (concatMapStringsSep "," toString v)
-    else if isInt v
-    then toString v
-    else if isBool v
-    then toString (if v then 1 else 0)
-    else if isHasAttr "_file"
-    then "trim(file_get_contents(${lib.escapeShellArg v._file}))"
-    else abort "The dokuwiki settings value ${lib.generators.toPretty {} v} can not be encoded.";
-
-  # Present until https://github.com/NixOS/nixpkgs/pull/208299 is merged
-  # so we can still use RFC42-Style settings in the meantime
-  mkPHPAttrVals = v: flatten (mapAttrsToList mkPHPKeyVal v);
-  mkPHPKeyVal = k: v: let
-    values =
-      if (isAttrs v && hasAttr "_file" v) || !isAttrs v
-      then [" = ${mkPHPValue v};"]
-      else mkPHPAttrVals v;
-  in
-    map (e: "[${escapeShellArg k}]${e}") (flatten values);
-  mkConfigLines = c: map (v: "$conf${v}") (mkPHPAttrVals c);
-
-  dokuwikiLocalConfig = settings: ''
-    ${concatStringsSep "\n" (mkConfigLines settings)}
-  '';
-
   acronyms = rec {
     "CCC" = "Chaos Computer Club";
     "PR" = "Pull Request";
@@ -105,8 +54,6 @@ in {
     locations."/robots.txt".return = "200 \"User-agent: *\nDisallow: /\"";
   };
 
-  services.phpfpm.pools.${fpm_pool}.phpPackage = lib.mkForce phpPackage;
-
   services.dokuwiki.sites.${dw_domain} = {
     package = pkgs.dokuwiki.overrideAttrs (oldAttrs: {
       name = "dokuwiki-${dw_domain}-with-acronyms-${oldAttrs.version}";
@@ -116,10 +63,8 @@ in {
     });
 
     enable = true;
-    aclUse = true;
 
-    pluginsConfig = let
+    pluginsConfig = {
-      plugins = {
       "tag" = true;
       "pagelist" = true;
       "smtp" = true;
@@ -141,10 +86,6 @@ in {
       "authpdo" = false;
       "authpgsql" = false;
     };
-    in ''
-      # Placeholder until https://github.com/NixOS/nixpkgs/pull/208299 is merged
-      ${concatStringsSep "\n" (mapAttrsToList (n: v: "$plugins['${n}'] = ${boolToString v};") plugins)};
-    '';
 
     plugins = with pkgs.dokuwikiPlugins; [
       tag
@@ -159,9 +100,9 @@ in {
       anonip
     ];
 
-    extraConfig = let
+    settings = let
       get_secret = name: {_file = config.sops.secrets.${name}.path;};
-      settings = rec {
+    in rec {
       title = "${baseDomain} Wiki";
       lang = "de-informal";
       template = "dokuwiki";
@@ -170,6 +111,7 @@ in {
       subscribers = 1;
       userewrite = 1;
       useslash = 1;
+      useacl = true;
       im_convert = "${pkgs.imagemagick}/bin/convert";
       superuser = "@admin";
       disableactions = "register";
@@ -208,8 +150,14 @@ in {
         openidurl = "https://sso.chaos.jetzt/auth/realms/chaos-jetzt/.well-known/openid-configuration";
       };
     };
-    in ''
+
-      ${dokuwikiLocalConfig settings}
+    phpOptions = {
-    '';
+      expose_php = "Off";
+      "opcache.interned_strings_buffer" = "8";
+      "opcache.max_accelerated_files" = "10000";
+      "opcache.memory_consumption" = "64";
+      "opcache.revalidate_freq" = "15";
+      "opcache.fast_shutdown" = "1";
+    };
   };
 }