浏览代码

Fix renew scripts

Bob Mottram 9 年前
父节点
当前提交
2dc6ccebe9
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6
    4
      src/freedombone

+ 6
- 4
src/freedombone 查看文件

1708
     echo '        if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_script
1708
     echo '        if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_script
1709
     echo '            ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_script
1709
     echo '            ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_script
1710
     echo '            if [ ! "$?" = "0" ]; then' >> $renewals_script
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
     echo -n "                cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_script
1714
     echo -n "                cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_script
1714
     echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_script
1715
     echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_script
1715
     echo '                rm ~/temp_renewletsencrypt.txt' >> $renewals_script
1716
     echo '                rm ~/temp_renewletsencrypt.txt' >> $renewals_script
1744
     echo '            if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_retry_script
1745
     echo '            if [ -f /etc/nginx/sites-available/$LETSENCRYPT_DOMAIN ]; then' >> $renewals_retry_script
1745
     echo '                ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_retry_script
1746
     echo '                ${PROJECT_NAME}-renew-cert -h $LETSENCRYPT_DOMAIN -p letsencrypt' >> $renewals_retry_script
1746
     echo '                if [ ! "$?" = "0" ]; then' >> $renewals_retry_script
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
     echo -n "                    cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_retry_script
1751
     echo -n "                    cat ~/temp_renewletsencrypt.txt | mail -s \"${renewal_email_title}\" " >> $renewals_retry_script
1750
     echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_retry_script
1752
     echo '$ADMIN_EMAIL_ADDRESS' >> $renewals_retry_script
1751
     echo '                    rm ~/temp_renewletsencrypt.txt' >> $renewals_retry_script
1753
     echo '                    rm ~/temp_renewletsencrypt.txt' >> $renewals_retry_script