Commit 8b4f5234 authored by René Neumann's avatar René Neumann
Browse files

nixos/dokuwiki: Support `extraConfigs` in combine 

Add a new option `extraConfigs` that is then passed to the improved
`combine` function.
parent 9ba60724

nixos/modules/services/web-apps/dokuwiki.nix

+17 −1
Original line number Diff line number Diff line
@@ -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;

nixos/tests/dokuwiki.nix

+3 −7
Original line number Diff line number Diff line
@@ -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";