summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-03-02 00:21:26 +0000
committerGitHub <noreply@github.com>2019-03-02 00:21:26 +0000
commite4808a6587b24a1f622d3e38a3820313f100a070 (patch)
treecc81ca6a9f4477d7f4927efc1c876929ef32171a /nixos
parent5e3b160b5c0ce20cab872aa8796aee90ab400196 (diff)
parentb42c24f7f27a6a232f61a7c24afd7a7d00f21479 (diff)
downloadnixpkgs-e4808a6587b24a1f622d3e38a3820313f100a070.tar
nixpkgs-e4808a6587b24a1f622d3e38a3820313f100a070.tar.gz
nixpkgs-e4808a6587b24a1f622d3e38a3820313f100a070.tar.bz2
nixpkgs-e4808a6587b24a1f622d3e38a3820313f100a070.tar.lz
nixpkgs-e4808a6587b24a1f622d3e38a3820313f100a070.tar.xz
nixpkgs-e4808a6587b24a1f622d3e38a3820313f100a070.tar.zst
nixpkgs-e4808a6587b24a1f622d3e38a3820313f100a070.zip
Merge pull request #56489 from Ma27/add-nextcloud-overwriteprotocol-option
nixos/nextcloud: add overwriteProtocol option
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 49d8836b8ad..68b875333d6 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -223,6 +223,19 @@ in {
           <literal>services.nextcloud.hostname</literal> here.
         '';
       };
+
+      overwriteProtocol = mkOption {
+        type = types.nullOr (types.enum [ "http" "https" ]);
+        default = null;
+        example = "https";
+
+        description = ''
+          Force Nextcloud to always use HTTPS i.e. for link generation. Nextcloud
+          uses the currently used protocol by default, but when behind a reverse-proxy,
+          it may use <literal>http</literal> for everything although Nextcloud
+          may be served via HTTPS.
+        '';
+      };
     };
 
     caching = {
@@ -287,6 +300,7 @@ in {
               ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
               'log_type' => 'syslog',
               'log_level' => '${builtins.toString cfg.logLevel}',
+              ${optionalString (cfg.config.overwriteProtocol != null) "'overwriteprotocol' => '${cfg.config.overwriteProtocol}',"}
             ];
           '';
           occInstallCmd = let