diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-08-10 02:08:58 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-08-10 02:25:55 +0300 |
| commit | b8c14093adba8b8c9fd55ee1b691ecb8f98591fb (patch) | |
| tree | 462d67aadff7bc124d336a71a4e779e6514333bf | |
| parent | 5a05b8990fd3e89b8f3e8f5509e34497756e417d (diff) | |
letsencrypt: ability to disable it and roll back to self-signed certificatesv1.37.9
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/NETWORKING/letsencrypt.sh | 9 | ||||
| -rw-r--r-- | changelog.md | 16 | ||||
| -rw-r--r-- | etc/ncp-config.d/letsencrypt.cfg | 6 |
3 files changed, 30 insertions, 1 deletions
diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh index c40a4fa9..2783bcad 100644 --- a/bin/ncp/NETWORKING/letsencrypt.sh +++ b/bin/ncp/NETWORKING/letsencrypt.sh @@ -53,6 +53,15 @@ EOF # tested with certbot 0.28.0 configure() { + [[ "${ACTIVE}" != "yes" ]] && { + rm -rf /etc/letsencrypt/live/* + rm -f /etc/cron.weekly/letsencrypt-ncp + rm -f /etc/letsencrypt/renewal-hooks/deploy/ncp + [[ "$DOCKERBUILD" == 1 ]] && update-rc.d letsencrypt disable + bash /usr/local/etc/ncp-templates/nextcloud.conf.sh > ${nc_vhostcfg} + echo "letsencrypt certificates disabled. Using self-signed certificates instead." + exit 0 + } local DOMAIN_LOWERCASE="${DOMAIN,,}" [[ "$DOMAIN" == "" ]] && { echo "empty domain"; return 1; } diff --git a/changelog.md b/changelog.md index 136791cc..58d96abf 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,19 @@ -[v1.37.2](https://github.com/nextcloud/nextcloudpi/commit/637ccfe) (2021-07-31) unattended-upgrades: update raspbian origins +[v1.37.9](https://github.com/nextcloud/nextcloudpi/commit/c08363e) (2021-08-09) letsencrypt: ability to disable it and roll back to self-signed certificates + +[v1.37.8 ](https://github.com/nextcloud/nextcloudpi/commit/5a05b89) (2021-08-08) nextcloud: remove beta option + +[v1.37.7 ](https://github.com/nextcloud/nextcloudpi/commit/1d696f0) (2021-08-07) nc-backup-auto.sh: don't smash ncp.log + +[v1.37.6 ](https://github.com/nextcloud/nextcloudpi/commit/b840245) (2021-08-03) metrics.sh: Fix inverted is_active result + +[v1.37.5 ](https://github.com/nextcloud/nextcloudpi/commit/fb102d2) (2021-08-03) metrics.sh: Fix USER variable being ignored + +[v1.37.4 ](https://github.com/nextcloud/nextcloudpi/commit/e492032) (2021-08-02) nextcloud.conf.sh: Allow any user name for metrics endpoint and fix docker build + +[v1.37.3 ](https://github.com/nextcloud/nextcloudpi/commit/b8a990e) (2021-08-02) Add ncp-app for prometheus (system) metrics + +[v1.37.2](https://github.com/nextcloud/nextcloudpi/commit/4300e30) (2021-07-31) unattended-upgrades: update raspbian origins [v1.37.1 ](https://github.com/nextcloud/nextcloudpi/commit/b1ffd70) (2021-07-06) ncp-app: bump to NC21 diff --git a/etc/ncp-config.d/letsencrypt.cfg b/etc/ncp-config.d/letsencrypt.cfg index 1ee41702..33cf658b 100644 --- a/etc/ncp-config.d/letsencrypt.cfg +++ b/etc/ncp-config.d/letsencrypt.cfg @@ -7,6 +7,12 @@ "infotitle": "Warning", "params": [ { + "id": "ACTIVE", + "name": "Active", + "value": "no", + "type": "bool" + }, + { "id": "DOMAIN", "name": "Domain", "value": "", |