Browse Source

Fix renew scripts

Bob Mottram 9 years ago
parent
commit
2dc6ccebe9
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      src/freedombone

+ 6
- 4
src/freedombone View File

@@ -1708,8 +1708,9 @@ function letsencrypt_renewals {
1708 1708
     echo '        if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_script
1709 1709
     echo '            ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_script
1710 1710
     echo '            if [ ! "$?" = "0" ]; then' >> $renewals_script
1711
-    echo "                echo \"${renewal_failure_msg}\n\n\" > ~/temp_renewletsencrypt.txt" >> $renewals_script
1712
-    echo '                ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt >> ~/temp_renewletsencrypt.txt' >> $renewals_script
1711
+    echo "                echo \"${renewal_failure_msg}\" > ~/temp_renewletsencrypt.txt" >> $renewals_script
1712
+    echo '                echo "" >> ~/temp_renewletsencrypt.txt' >> $renewals_script
1713
+    echo '                ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt 2>> ~/temp_renewletsencrypt.txt' >> $renewals_script
1713 1714
     echo -n "                cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_script
1714 1715
     echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_script
1715 1716
     echo '                rm ~/temp_renewletsencrypt.txt' >> $renewals_script
@@ -1744,8 +1745,9 @@ function letsencrypt_renewals {
1744 1745
     echo '            if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_retry_script
1745 1746
     echo '                ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_retry_script
1746 1747
     echo '                if [ ! "$?" = "0" ]; then' >> $renewals_retry_script
1747
-    echo "                    echo \"${renewal_failure_msg}\n\n\" > ~/temp_renewletsencrypt.txt" >> $renewals_retry_script
1748
-    echo '                    ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt >> ~/temp_renewletsencrypt.txt' >> $renewals_retry_script
1748
+    echo "                    echo \"${renewal_failure_msg}\" > ~/temp_renewletsencrypt.txt" >> $renewals_retry_script
1749
+    echo '                    echo "" >> ~/temp_renewletsencrypt.txt' >> $renewals_retry_script
1750
+    echo '                    ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt 2>> ~/temp_renewletsencrypt.txt' >> $renewals_retry_script
1749 1751
     echo -n "                    cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_retry_script
1750 1752
     echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_retry_script
1751 1753
     echo '                    rm ~/temp_renewletsencrypt.txt' >> $renewals_retry_script