From 7d105f8ebc2f8d2b201ae3ac45b35ee0933c1770 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Wed, 10 Jan 2018 14:32:45 +0100
Subject: [PATCH] letsencrypt: revert pip.conf pre-workaround, tweak cron

---
 etc/nextcloudpi-config.d/letsencrypt.sh |  6 +++++-
 update.sh                               | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh
index aa327ba54..5ede70c0d 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
diff --git a/update.sh b/update.sh
index e005bc801..a6900f20a 100755
--- a/update.sh
+++ b/update.sh
@@ -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