diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d1c0d2103522..456403c1b07f 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -115,7 +115,7 @@ let pkg = hostName: cfg: cfg.package.combine { - inherit (cfg) plugins templates; + inherit (cfg) plugins templates extraConfigs; pname = p: "${p.pname}-${hostName}"; @@ -345,6 +345,22 @@ let ''; }; + extraConfigs = mkOption { + type = types.attrsOf types.path; + default = { }; + description = '' + Path(s) to additional configuration files that are then linked to the 'conf' directory. + ''; + example = literalExpression '' + { + "acronyms.local.conf" = pkgs.writeText "acronyms.local.conf" ''' + r13y reproducibility + '''; + "entities.local.conf" = ./dokuwiki-entities; + } + ''; + }; + poolConfig = mkOption { type = with types; diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index dae7105172cb..7aa6e4f5857a 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -30,12 +30,6 @@ let r13y reproducibility ''; - dwWithAcronyms = pkgs.dokuwiki.combine { - extraConfigs = { - "acronyms.local.conf" = acronymsFile; - }; - }; - mkNode = webserver: { ... }: @@ -53,9 +47,11 @@ let }; }; "site2.local" = { - package = dwWithAcronyms; usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; plugins = [ plugin-icalevents ]; + extraConfigs = { + "acronyms.local.conf" = acronymsFile; + }; settings = { useacl = true; superuser = "admin";