diff options
author | Marek Mahut <marek.mahut@gmail.com> | 2020-08-05 11:54:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-05 11:54:42 +0200 |
commit | 0bc37f7cb40dfde509000b22a9e8f5c231d5250e (patch) | |
tree | 33e1af3c41db64db37ebce81a2b15bb68c76c3f2 /nixos/modules/services/web-apps/dokuwiki.nix | |
parent | 6cf131d54eee79c4e1012493b479bc6866c97aa1 (diff) | |
parent | 15b6edc4d1320d4b52e6d4222767cc145c940396 (diff) | |
download | nixpkgs-0bc37f7cb40dfde509000b22a9e8f5c231d5250e.tar nixpkgs-0bc37f7cb40dfde509000b22a9e8f5c231d5250e.tar.gz nixpkgs-0bc37f7cb40dfde509000b22a9e8f5c231d5250e.tar.bz2 nixpkgs-0bc37f7cb40dfde509000b22a9e8f5c231d5250e.tar.lz nixpkgs-0bc37f7cb40dfde509000b22a9e8f5c231d5250e.tar.xz nixpkgs-0bc37f7cb40dfde509000b22a9e8f5c231d5250e.tar.zst nixpkgs-0bc37f7cb40dfde509000b22a9e8f5c231d5250e.zip |
Merge pull request #94609 from 1000101/dokuwiki
nixos/dokuwiki: drop SSL forcing and document incompatibility
Diffstat (limited to 'nixos/modules/services/web-apps/dokuwiki.nix')
-rw-r--r-- | nixos/modules/services/web-apps/dokuwiki.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index cebeaaab37e..e90675178cc 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -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."; }; }; |