movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/dokuwiki: refactor

Browse source
This commit is contained in:
dadada 2020-03-30 13:00:35 +02:00
parent dc7ed06615
commit 71baf4801c
No known key found for this signature in database
GPG key ID: EEB8D1CE62C4DFEA
1 changed files with 159 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/web-apps/dokuwiki.nix
View file

@ -53,8 +53,7 @@ let
''; '';
}; };
siteOpts = {lib, name, ...}: siteOpts = {lib, name, ...}: {
{
options = { options = {
enable = mkEnableOption "DokuWiki web application."; enable = mkEnableOption "DokuWiki web application.";
@ -244,7 +243,6 @@ in
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx { virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx {
root = mkForce "${pkg hostName cfg}/share/dokuwiki/"; root = mkForce "${pkg hostName cfg}/share/dokuwiki/";
extraConfig = "fastcgi_param HTTPS on;"; extraConfig = "fastcgi_param HTTPS on;";
@ -303,6 +301,5 @@ in
"d ${stateDir cfg}/pages 0750 ${user} ${group} - -" "d ${stateDir cfg}/pages 0750 ${user} ${group} - -"
"d ${stateDir cfg}/tmp 0750 ${user} ${group} - -" "d ${stateDir cfg}/tmp 0750 ${user} ${group} - -"
]) eachSite); ]) eachSite);
}; };
} }