diff options
author | nachoparker <nacho@ownyourbits.com> | 2018-01-10 16:32:45 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2018-01-10 16:36:17 +0300 |
commit | 7d105f8ebc2f8d2b201ae3ac45b35ee0933c1770 (patch) | |
tree | 5e4d0f9d569dcc0a9874f57ec2d6854763c539dc | |
parent | db322f2d095e14d501b34e82c6acd3ab0ece03e0 (diff) |
letsencrypt: revert pip.conf pre-workaround, tweak cronv0.44.13
-rw-r--r-- | etc/nextcloudpi-config.d/letsencrypt.sh | 6 | ||||
-rwxr-xr-x | update.sh | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh index aa327ba5..5ede70c0 100644 --- a/etc/nextcloudpi-config.d/letsencrypt.sh +++ b/etc/nextcloudpi-config.d/letsencrypt.sh @@ -66,7 +66,11 @@ configure() sed -i "/DocumentRoot/aServerName $DOMAIN_" $VHOSTCFG /etc/letsencrypt/letsencrypt-auto certonly -n --no-self-upgrade --webroot -w $NCDIR --hsts --agree-tos -m $EMAIL_ -d $DOMAIN_ && { - echo "* 1 * * 1 root /etc/letsencrypt/certbot-auto renew --quiet" > /etc/cron.d/letsencrypt-ncp + cat > /etc/cron.weekly/letsencrypt-ncp <<EOF +#!/bin/bash +/etc/letsencrypt/certbot-auto renew --quiet +EOF + chmod +x /etc/cron.weekly/letsencrypt-ncp sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/fullchain.pem|" $VHOSTCFG sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/privkey.pem|" $VHOSTCFG @@ -211,6 +211,21 @@ EOF grep -q '^ACTIVE_=yes$' nc-backup-auto.sh && activate_script nc-backup-auto.sh cd - &>/dev/null + # restore pip.conf after workaround + cat > /etc/pip.conf <<EOF +[global] +extra-index-url=https://www.piwheels.hostedpi.com/simple +EOF + + # update cron letsencrypt + [[ -f /etc/cron.d/letsencrypt-ncp ]] && rm -f /etc/cron.d/letsencrypt-ncp && { + cat > /etc/cron.weekly/letsencrypt-ncp <<EOF +#!/bin/bash +/etc/letsencrypt/certbot-auto renew --quiet +EOF + chmod +x /etc/cron.weekly/letsencrypt-ncp + } + } # end - only live updates exit 0 |