diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-10-28 00:18:41 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-10-28 00:18:57 +0300 |
| commit | 532a6a8bb6e994d3277b0d9a776df5d978ff1b6c (patch) | |
| tree | 5e4fd8de9739e8cf28ba6521c24dc619f4242f15 | |
| parent | 41368fedfca1e7c4a3da21e45796a35971df11e8 (diff) | |
letsencrypt: sync ncp and nc cert pathsv1.42.5
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/NETWORKING/letsencrypt.sh | 14 | ||||
| -rw-r--r-- | etc/ncp-templates/nextcloud.conf.sh | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh index e1965ef6..a7278884 100644 --- a/bin/ncp/NETWORKING/letsencrypt.sh +++ b/bin/ncp/NETWORKING/letsencrypt.sh @@ -10,7 +10,7 @@ ncdir=/var/www/nextcloud nc_vhostcfg=/etc/apache2/sites-available/nextcloud.conf -vhostcfg2=/etc/apache2/sites-available/ncp.conf +ncp_vhostcfg=/etc/apache2/sites-available/ncp.conf letsencrypt=/usr/bin/letsencrypt is_active() @@ -58,8 +58,10 @@ configure() rm -f /etc/letsencrypt/renewal-hooks/deploy/ncp [[ "$DOCKERBUILD" == 1 ]] && update-rc.d letsencrypt disable install_template nextcloud.conf.sh "${nc_vhostcfg}" - sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem|" "${vhostcfg2}" - sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key|" "${vhostcfg2}" + local cert_path="$(grep SSLCertificateFile "${nc_vhostcfg}" | awk '{ print $2 }')" + local key_path="$(grep SSLCertificateKeyFile "${nc_vhostcfg}" | awk '{ print $2 }')" + sed -i "s|SSLCertificateFile.*|SSLCertificateFile ${cert_path}|" "${ncp_vhostcfg}" + sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile ${key_path}|" "${ncp_vhostcfg}" apachectl -k graceful echo "letsencrypt certificates disabled. Using self-signed certificates instead." exit 0 @@ -113,8 +115,10 @@ EOF # Configure Apache install_template nextcloud.conf.sh "${nc_vhostcfg}" - sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/fullchain.pem|" "${vhostcfg2}" - sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/privkey.pem|" "${vhostcfg2}" + local cert_path="$(grep SSLCertificateFile "${nc_vhostcfg}" | awk '{ print $2 }')" + local key_path="$(grep SSLCertificateKeyFile "${nc_vhostcfg}" | awk '{ print $2 }')" + sed -i "s|SSLCertificateFile.*|SSLCertificateFile ${cert_path}|" "${ncp_vhostcfg}" + sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile ${key_path}|" "${ncp_vhostcfg}" # Configure Nextcloud local domain_index="${TRUSTED_DOMAINS[letsencrypt_1]}" diff --git a/etc/ncp-templates/nextcloud.conf.sh b/etc/ncp-templates/nextcloud.conf.sh index 16ee4062..c75deaea 100644 --- a/etc/ncp-templates/nextcloud.conf.sh +++ b/etc/ncp-templates/nextcloud.conf.sh @@ -67,6 +67,7 @@ fi LETSENCRYPT_CERT_PATH="${LETSENCRYPT_CERT_BASE_PATH}/fullchain.pem" LETSENCRYPT_KEY_PATH="${LETSENCRYPT_CERT_BASE_PATH}/privkey.pem" } + cat <<EOF CustomLog /var/log/apache2/nc-access.log combined ErrorLog /var/log/apache2/nc-error.log |