diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-09-30 19:30:56 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-09-30 21:29:37 +0300 |
| commit | f1c90f543de8fb0813ba00164dbd8e36632b0fd3 (patch) | |
| tree | 6d87b5669d0c809bac29421282461e3483907f6a | |
| parent | c037c11dfc6e785893907fd354031d7f4c517213 (diff) | |
nc-httpsonly: always use overwriteprotocol https in all casesv1.39.18
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/CONFIG/nc-httpsonly.sh | 7 | ||||
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | updates/1.40.0.sh | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/bin/ncp/CONFIG/nc-httpsonly.sh b/bin/ncp/CONFIG/nc-httpsonly.sh index 147dc0aa..e51b1b7c 100644 --- a/bin/ncp/CONFIG/nc-httpsonly.sh +++ b/bin/ncp/CONFIG/nc-httpsonly.sh @@ -13,12 +13,11 @@ configure() { [[ -f /.ncp-image ]] && return 0 if [[ $ACTIVE == "no" ]]; then - local opt=Off proto=https - else - local opt=On proto=http + local opt=Off + else + local opt=On fi sed -i "s|RewriteEngine .*|RewriteEngine $opt|" /etc/apache2/sites-available/000-default.conf - ncc config:system:set overwriteprotocol --value="${proto}" apachectl -k graceful echo "Forcing HTTPS $opt" } diff --git a/changelog.md b/changelog.md index ce52e041..e85f0333 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v1.39.17](https://github.com/nextcloud/nextcloudpi/commit/520f062) (2021-09-29) add bash completion to ncc +[v1.39.18](https://github.com/nextcloud/nextcloudpi/commit/edaf4f1) (2021-09-30) nc-httpsonly: always use overwriteprotocol https in all cases + +[v1.39.17](https://github.com/nextcloud/nextcloudpi/commit/c037c11) (2021-09-29) add bash completion to ncc [v1.39.16](https://github.com/nextcloud/nextcloudpi/commit/2be666b) (2021-09-27) nc-https: proto logic was inverted fix diff --git a/updates/1.40.0.sh b/updates/1.40.0.sh index 2741ab7b..71312587 100644 --- a/updates/1.40.0.sh +++ b/updates/1.40.0.sh @@ -35,6 +35,7 @@ EOF # fix issue with reverse proxy infinite redirections run_app nc-httpsonly +ncc config:system:set overwriteprotocol --value="https" # bash completion for `ncc` if ! [[ -f /usr/share/bash-completion/completions/ncp ]]; then |