diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-09-23 19:30:08 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-09-23 19:30:13 +0300 |
| commit | eef7b096bf59a8067310d5f2473c6551938f56db (patch) | |
| tree | 9925a1e132a012ac09dae2177ce57324629b02e2 | |
| parent | 814569be56e37ccf22ad0f6e2ba4fdc0c7cb2264 (diff) | |
ncp-web: make letsencrypt detection more robustv1.39.13
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp-diag | 4 | ||||
| -rw-r--r-- | changelog.md | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/ncp-diag b/bin/ncp-diag index fa39cefe..d19afcef 100644 --- a/bin/ncp-diag +++ b/bin/ncp-diag @@ -92,8 +92,8 @@ echo "gateway|$GW" echo "interface|$IFACE" # Certificates -CERTS="$( grep "SSLCertificateFile /etc/letsencrypt/live/" /etc/apache2/sites-available/nextcloud.conf \ - | sed 's|.*SSLCertificateFile /etc/letsencrypt/live/||;s|/fullchain.pem||' )" +CERTS="$( grep "SSLCertificateFile */etc/letsencrypt/live/" /etc/apache2/sites-available/nextcloud.conf \ + | sed 's|.*SSLCertificateFile */etc/letsencrypt/live/||;s|/fullchain.pem||' )" [[ "$CERTS" == "" ]] && CERTS=none echo "certificates|$CERTS" diff --git a/changelog.md b/changelog.md index ea87f873..9583702e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v1.39.12](https://github.com/nextcloud/nextcloudpi/commit/43e19cc) (2021-09-22) fix junk in overwrite.cli.url because of Redis not being yet ready +[v1.39.13](https://github.com/nextcloud/nextcloudpi/commit/6dbc76e) (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 [v1.39.11](https://github.com/nextcloud/nextcloudpi/commit/4039da9) (2021-09-21) letsencrypt: take into account duplicate domains ending in -0001 |