nc-https:only fix infinite redirects behind proxy

Signed-off-by: nachoparker <[email protected]>
nextcloud · Sep 25, 2021 · 6ad96ed · 6ad96ed
1 parent eef7b09
commit 6ad96ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/bin/ncp/CONFIG/nc-httpsonly.sh b/bin/ncp/CONFIG/nc-httpsonly.sh
@@ -12,7 +12,7 @@
 configure()
 {
   [[ -f /.ncp-image ]] && return 0
-  [[ $ACTIVE == "no" ]] && local opt=Off proto=https || local opt=On proto=http
+  [[ $ACTIVE == "no" ]] && local opt=Off proto=http || local opt=On proto=https
   sed -i "s|RewriteEngine .*|RewriteEngine $opt|" /etc/apache2/sites-available/000-default.conf
   ncc config:system:set overwriteprotocol --value="${proto}"
   apachectl -k graceful

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 
-[v1.39.13](https://github.com/nextcloud/nextcloudpi/commit/6dbc76e) (2021-09-23) ncp-web: make letsencrypt detection more robust
+[v1.39.14](https://github.com/nextcloud/nextcloudpi/commit/077c3bc) (2021-09-25) nc-https:only fix infinite redirects behind proxy
+
+[v1.39.13](https://github.com/nextcloud/nextcloudpi/commit/eef7b09) (2021-09-23) ncp-web: make letsencrypt detection more robust
 
 [v1.39.12](https://github.com/nextcloud/nextcloudpi/commit/814569b) (2021-09-22) fix junk in overwrite.cli.url because of Redis not being yet ready
 

diff --git a/updates/1.40.0.sh b/updates/1.40.0.sh
@@ -31,6 +31,10 @@ install_app nc-restore
   </Directory>
 </VirtualHost>
 EOF
+  apachectl -k graceful
+
+# fix issue with reverse proxy infinite redirections
+run_app nc-httpsonly
 
 # docker images only
 [[ -f /.docker-image ]] && {