Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornachoparker <nacho@ownyourbits.com>2021-09-28 03:31:57 +0300
committernachoparker <nacho@ownyourbits.com>2021-09-28 03:32:02 +0300
commit2be666b1f5f43492929bc00872283f6e7ece2443 (patch)
treec4520ad8bc001ee2f0bf70f6bce7faec15859e9c
parentb0678445501a39a4fd52e98b011c709352632b7b (diff)
nc-https: proto logic was inverted fixv1.39.16
Signed-off-by: nachoparker <nacho@ownyourbits.com>
-rw-r--r--bin/ncp/CONFIG/nc-httpsonly.sh6
-rw-r--r--changelog.md4
2 files changed, 8 insertions, 2 deletions
diff --git a/bin/ncp/CONFIG/nc-httpsonly.sh b/bin/ncp/CONFIG/nc-httpsonly.sh
index a70bac03..147dc0aa 100644
--- a/bin/ncp/CONFIG/nc-httpsonly.sh
+++ b/bin/ncp/CONFIG/nc-httpsonly.sh
@@ -12,7 +12,11 @@
configure()
{
[[ -f /.ncp-image ]] && return 0
- [[ $ACTIVE == "no" ]] && local opt=Off proto=http || local opt=On proto=https
+ if [[ $ACTIVE == "no" ]]; then
+ local opt=Off proto=https
+ else
+ local opt=On proto=http
+ fi
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
index db575ae6..7e60de1f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
-[v1.39.15](https://github.com/nextcloud/nextcloudpi/commit/3e408f1) (2021-09-27) add get_ip function
+[v1.39.16](https://github.com/nextcloud/nextcloudpi/commit/e6ebc3d) (2021-09-27) nc-https: proto logic was inverted fix
+
+[v1.39.15](https://github.com/nextcloud/nextcloudpi/commit/b067844) (2021-09-27) add get_ip function
[v1.39.14](https://github.com/nextcloud/nextcloudpi/commit/6ad96ed) (2021-09-25) nc-https:only fix infinite redirects behind proxy