summary refs log tree commit diff
path: root/nixos/modules/services/web-apps/dokuwiki.nix
diff options
context:
space:
mode:
author1000101 <b1000101@pm.me>2020-08-03 15:26:38 +0200
committer1000101 <b1000101@pm.me>2020-08-03 16:10:05 +0200
commit850b3ea028c312ae7e59584e83f0ec694d052b19 (patch)
tree5be5979f9878bff56858ae6cd54935c53c5a09a0 /nixos/modules/services/web-apps/dokuwiki.nix
parent4181ae25bffd50169b3c2ff951db3b7f84afa8c0 (diff)
downloadnixpkgs-850b3ea028c312ae7e59584e83f0ec694d052b19.tar
nixpkgs-850b3ea028c312ae7e59584e83f0ec694d052b19.tar.gz
nixpkgs-850b3ea028c312ae7e59584e83f0ec694d052b19.tar.bz2
nixpkgs-850b3ea028c312ae7e59584e83f0ec694d052b19.tar.lz
nixpkgs-850b3ea028c312ae7e59584e83f0ec694d052b19.tar.xz
nixpkgs-850b3ea028c312ae7e59584e83f0ec694d052b19.tar.zst
nixpkgs-850b3ea028c312ae7e59584e83f0ec694d052b19.zip
nixos/dokuwiki: drop SSL forcing
Diffstat (limited to 'nixos/modules/services/web-apps/dokuwiki.nix')
-rw-r--r--nixos/modules/services/web-apps/dokuwiki.nix17
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 fe6b9210d24..ab6ce749ad5 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.";
     };
   };