From 2dc6ccebe999182ca66ec0dc9a3575a7bc978536 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 2 Jan 2016 11:47:11 +0000 Subject: [PATCH] Fix renew scripts --- src/freedombone | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/freedombone b/src/freedombone index 8ab9e3dc..5ac03f4d 100755 --- a/src/freedombone +++ b/src/freedombone @@ -1708,8 +1708,9 @@ function letsencrypt_renewals { echo ' if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_script echo ' ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_script echo ' if [ ! "$?" = "0" ]; then' >> $renewals_script - echo " echo \"${renewal_failure_msg}\n\n\" > ~/temp_renewletsencrypt.txt" >> $renewals_script - echo ' ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt >> ~/temp_renewletsencrypt.txt' >> $renewals_script + echo " echo \"${renewal_failure_msg}\" > ~/temp_renewletsencrypt.txt" >> $renewals_script + echo ' echo "" >> ~/temp_renewletsencrypt.txt' >> $renewals_script + echo ' ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt 2>> ~/temp_renewletsencrypt.txt' >> $renewals_script echo -n " cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_script echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_script echo ' rm ~/temp_renewletsencrypt.txt' >> $renewals_script @@ -1744,8 +1745,9 @@ function letsencrypt_renewals { echo ' if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_retry_script echo ' ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_retry_script echo ' if [ ! "$?" = "0" ]; then' >> $renewals_retry_script - echo " echo \"${renewal_failure_msg}\n\n\" > ~/temp_renewletsencrypt.txt" >> $renewals_retry_script - echo ' ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt >> ~/temp_renewletsencrypt.txt' >> $renewals_retry_script + echo " echo \"${renewal_failure_msg}\" > ~/temp_renewletsencrypt.txt" >> $renewals_retry_script + echo ' echo "" >> ~/temp_renewletsencrypt.txt' >> $renewals_retry_script + echo ' ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt 2>> ~/temp_renewletsencrypt.txt' >> $renewals_retry_script echo -n " cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_retry_script echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_retry_script echo ' rm ~/temp_renewletsencrypt.txt' >> $renewals_retry_script