ncp-web: make letsencrypt detection more robust

Signed-off-by: nachoparker <[email protected]>
nextcloud · Sep 23, 2021 · eef7b09 · eef7b09
1 parent 814569b
commit eef7b09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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