public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/dokuwiki: drop SSL forcing

Browse Source
This commit is contained in:
1000101 2020-08-03 15:26:38 +02:00
parent 4181ae25bf
commit 850b3ea028
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/web-apps/dokuwiki.nix
View File

@ -249,22 +249,19 @@ let
nginx = mkOption { nginx = mkOption {
type = types.submodule ( type = types.submodule (
recursiveUpdate recursiveUpdate
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}
{
# Enable encryption by default,
options.forceSSL.default = true;
options.enableACME.default = true;
}
); );
default = {forceSSL = true; enableACME = true;}; default = {};
example = { example = {
serverAliases = [ serverAliases = [
"wiki.\${config.networking.domain}" "wiki.\${config.networking.domain}"
]; ];
enableACME = false; # To enable encryption and let let's encrypt take care of certificate
forceSSL = true;
enableACME = true;
}; };
description = '' description = ''
With this option, you can customize the nginx virtualHost which already has sensible defaults for DokuWiki. With this option, you can customize the nginx virtualHost settings.
''; '';
}; };
}; };
@ -276,7 +273,7 @@ in
services.dokuwiki = mkOption { services.dokuwiki = mkOption {
type = types.attrsOf (types.submodule siteOpts); type = types.attrsOf (types.submodule siteOpts);
default = {}; default = {};
description = "Sepcification of one or more dokuwiki sites to service."; description = "Sepcification of one or more dokuwiki sites to serve.";
}; };
}; };

8
nixos/tests/dokuwiki.nix
View File

@ -39,18 +39,10 @@ in {
services.dokuwiki."site1.local" = { services.dokuwiki."site1.local" = {
aclUse = false; aclUse = false;
superUser = "admin"; superUser = "admin";
nginx = {
forceSSL = false;
enableACME = false;
};
}; };
services.dokuwiki."site2.local" = { services.dokuwiki."site2.local" = {
aclUse = true; aclUse = true;
superUser = "admin"; superUser = "admin";
nginx = {
forceSSL = false;
enableACME = false;
};
templates = [ template-bootstrap3 ]; templates = [ template-bootstrap3 ];
plugins = [ plugin-icalevents ]; plugins = [ plugin-icalevents ];
}; };