diff options
author | dadada <dadada@dadada.li> | 2020-04-18 11:30:19 +0200 |
---|---|---|
committer | dadada <dadada@dadada.li> | 2020-04-18 23:37:19 +0200 |
commit | 2d86cca35edbac2cba329a59c27630a2131cda91 (patch) | |
tree | 4858a19edd1fe81788bfd420a3eda01c6cb54795 /nixos/modules/services/web-apps/dokuwiki.nix | |
parent | 9460fb578880de9a10815001c7587bf211e95562 (diff) | |
download | nixpkgs-2d86cca35edbac2cba329a59c27630a2131cda91.tar nixpkgs-2d86cca35edbac2cba329a59c27630a2131cda91.tar.gz nixpkgs-2d86cca35edbac2cba329a59c27630a2131cda91.tar.bz2 nixpkgs-2d86cca35edbac2cba329a59c27630a2131cda91.tar.lz nixpkgs-2d86cca35edbac2cba329a59c27630a2131cda91.tar.xz nixpkgs-2d86cca35edbac2cba329a59c27630a2131cda91.tar.zst nixpkgs-2d86cca35edbac2cba329a59c27630a2131cda91.zip |
nixos/dokuwiki: change default of aclFile and usersFile
`aclFile` and `usersFile` will be set to a default value if `aclUse` is specified and aclFile is not overriden by `acl`.
Diffstat (limited to 'nixos/modules/services/web-apps/dokuwiki.nix')
-rw-r--r-- | nixos/modules/services/web-apps/dokuwiki.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index e3597ef3c39..76e18266a27 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -57,7 +57,7 @@ let ''; }; - siteOpts = {lib, name, ...}: { + siteOpts = { config, lib, name, ...}: { options = { enable = mkEnableOption "DokuWiki web application."; @@ -95,7 +95,7 @@ let aclFile = mkOption { type = with types; nullOr str; - default = null; + default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/users.auth.php" else null; description = '' Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl Mutually exclusive with services.dokuwiki.acl which is preferred. @@ -140,7 +140,7 @@ let usersFile = mkOption { type = with types; nullOr str; - default = null; + default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null; description = '' Location of the dokuwiki users file. List of users. Format: login:passwordhash:Real Name:email:groups,comma,separated |