External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

letsencrypt: fix active status check

Browse Source 
Signed-off-by: nachoparker <nacho@ownyourbits.com>
This commit is contained in:
nachoparker 2021-09-21 12:15:12 -06:00
parent 98976c91b3
commit 1046a2413b
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/ncp/NETWORKING/letsencrypt.sh
View File

@ -21,7 +21,7 @@ is_active()
tmpl_letsencrypt_domain() {
(
. /usr/local/etc/library.sh
if is_active; then
if is_active_app letsencrypt; then
find_app_param letsencrypt DOMAIN
fi
)
@ -50,7 +50,6 @@ EOF
return 0
}
# tested with certbot 0.28.0
configure()
{
[[ "${ACTIVE}" != "yes" ]] && {

22
changelog.md
View File

@ -1,7 +1,29 @@
<<<<<<< HEAD
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/5ba3e68) (2021-09-22) dont update config if Redis is not yet ready
=======
<<<<<<< HEAD
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/ef88f48) (2021-09-22) dont update config if Redis is not yet ready
>>>>>>> 37f01dc (letsencrypt: fix active status check)
[v1.39.6 ](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine
=======
<<<<<<< HEAD
<<<<<<< HEAD
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/ef88f48) (2021-09-22) dont update config if Redis is not yet ready
[v1.39.6 ](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine
=======
=======
>>>>>>> 3c905ea (letsencrypt: fix active status check)
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/a6fd394) (2021-09-22) dont update config if Redis is not yet ready
=======
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/c651cf8) (2021-09-21) letsencrypt: fix active status check
>>>>>>> a07ddd2 (letsencrypt: fix active status check)
[v1.39.6](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine
>>>>>>> f289443 (dont update config if Redis is not yet ready)
>>>>>>> 6b852d2 (letsencrypt: fix active status check)
[v1.39.5 ](https://github.com/nextcloud/nextcloudpi/commit/cb184d2) (2021-09-19) ncp-update-nc: dont keep notifying when there is nothing to upgrade

2
etc/ncp-templates/nextcloud.conf.sh
View File

@ -13,7 +13,7 @@ if [[ "$1" != "--defaults" ]]; then
)"
fi
if [[ "$DOCKERBUILD" != 1 ]] && [[ "$1" != "--defaults" ]]; then
if [[ -f /.docker-image ]] && [[ "$1" != "--defaults" ]]; then
METRICS_IS_ENABLED="$(
source "${BINDIR}/SYSTEM/metrics.sh"
tmpl_metrics_enabled && echo yes || echo no