From e0d9aea83cb46f487292de5ff5e50d70168ebc63 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Mon, 31 Jul 2017 12:53:22 +0200 Subject: use letsencrypt certificate for ncp-web --- etc/nextcloudpi-config.d/letsencrypt.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh index 4d969182..a35f617c 100644 --- a/etc/nextcloudpi-config.d/letsencrypt.sh +++ b/etc/nextcloudpi-config.d/letsencrypt.sh @@ -17,7 +17,8 @@ DOMAIN_=mycloud.ownyourbits.com EMAIL_=mycloud@ownyourbits.com NCDIR_=/var/www/nextcloud -VHOSTCFG_=/etc/apache2/sites-available/nextcloud.conf +VHOSTCFG=/etc/apache2/sites-available/nextcloud.conf +VHOSTCFG2=/etc/apache2/sites-available/ncp.conf DESCRIPTION="Automatic signed SSL certificates" install() @@ -42,12 +43,15 @@ Your certificate will be automatically renewed every month # tested with git version v0.11.0-71-g018a304 configure() { - grep -q ServerName $VHOSTCFG_ && \ - sed -i "s|ServerName .*|ServerName $DOMAIN_|" $VHOSTCFG_ || \ - sed -i "/DocumentRoot/aServerName $DOMAIN_" $VHOSTCFG_ + grep -q ServerName $VHOSTCFG && \ + sed -i "s|ServerName .*|ServerName $DOMAIN_|" $VHOSTCFG || \ + sed -i "/DocumentRoot/aServerName $DOMAIN_" $VHOSTCFG - sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_/fullchain.pem|" $VHOSTCFG_ - sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_/privkey.pem|" $VHOSTCFG_ + sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_/fullchain.pem|" $VHOSTCFG + sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_/privkey.pem|" $VHOSTCFG + + sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_/fullchain.pem|" $VHOSTCFG2 + sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_/privkey.pem|" $VHOSTCFG2 /etc/letsencrypt/letsencrypt-auto certonly -n --no-self-upgrade --webroot -w $NCDIR_ --hsts --agree-tos -m $EMAIL_ -d $DOMAIN_ || return 1 echo "* 1 * * 1 root /etc/letsencrypt/certbot-auto renew --quiet" > /etc/cron.d/letsencrypt-ncp -- cgit v1.2.3