alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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 {
type = types.submodule (
recursiveUpdate
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
{
# Enable encryption by default,
options.forceSSL.default = true;
options.enableACME.default = true;
}
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}
);
default = {forceSSL = true; enableACME = true;};
default = {};
example = {
serverAliases = [
"wiki.\${config.networking.domain}"
];
enableACME = false;
# To enable encryption and let let's encrypt take care of certificate
forceSSL = true;
enableACME = true;
};
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 {
type = types.attrsOf (types.submodule siteOpts);
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" = {
aclUse = false;
superUser = "admin";
nginx = {
forceSSL = false;
enableACME = false;
};
};
services.dokuwiki."site2.local" = {
aclUse = true;
superUser = "admin";
nginx = {
forceSSL = false;
enableACME = false;
};
templates = [ template-bootstrap3 ];
plugins = [ plugin-icalevents ];
};