free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If a collision happens between cert upgrade and general upgrade then create the failure file so that retries will happen

This commit is contained in:
Bob Mottram 2018-06-09 10:15:14 +01:00
parent e20a24a9ca
commit 99fc662547
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/freedombone-utils-web
View File

@ -315,6 +315,13 @@ function letsencrypt_renewals {
# the main script tries to renew once per month # the main script tries to renew once per month
{ echo '#!/bin/bash'; { echo '#!/bin/bash';
echo '';
echo 'if [ -f /tmp/.upgrading ]; then';
echo ' if [ ! -f ~/letsencrypt_failed ]; then';
echo ' touch ~/letsencrypt_failed';
echo ' fi';
echo ' exit 0';
echo 'fi';
echo ''; echo '';
echo "PROJECT_NAME='${PROJECT_NAME}'"; echo "PROJECT_NAME='${PROJECT_NAME}'";
echo "COMPLETION_FILE=\$HOME/\${PROJECT_NAME}-completed.txt"; echo "COMPLETION_FILE=\$HOME/\${PROJECT_NAME}-completed.txt";
@ -329,6 +336,14 @@ function letsencrypt_renewals {
echo "}')"; echo "}')";
echo " ADMIN_EMAIL_ADDRESS=\$ADMIN_USERNAME@\$HOSTNAME"; echo " ADMIN_EMAIL_ADDRESS=\$ADMIN_USERNAME@\$HOSTNAME";
echo ' for d in /etc/letsencrypt/live/*/ ; do'; echo ' for d in /etc/letsencrypt/live/*/ ; do';
echo '';
echo ' if [ -f /tmp/.upgrading ]; then';
echo ' if [ ! -f ~/letsencrypt_failed ]; then';
echo ' touch ~/letsencrypt_failed';
echo ' fi';
echo ' exit 0';
echo ' fi';
echo '';
echo -n " LETSENCRYPT_DOMAIN=\$(echo \"\$d\" | "; echo -n " LETSENCRYPT_DOMAIN=\$(echo \"\$d\" | ";
echo -n "awk -F '/' '{print "; echo -n "awk -F '/' '{print ";
echo -n "\$5"; echo -n "\$5";
@ -366,6 +381,9 @@ function letsencrypt_renewals {
{ echo '#!/bin/bash'; { echo '#!/bin/bash';
echo ''; echo '';
echo 'if [ -f /tmp/.upgrading ]; then'; echo 'if [ -f /tmp/.upgrading ]; then';
echo ' if [ ! -f ~/letsencrypt_failed ]; then';
echo ' touch ~/letsencrypt_failed';
echo ' fi';
echo ' exit 0'; echo ' exit 0';
echo 'fi'; echo 'fi';
echo ''; echo '';
@ -383,6 +401,9 @@ function letsencrypt_renewals {
echo ' for d in /etc/letsencrypt/live/*/ ; do'; echo ' for d in /etc/letsencrypt/live/*/ ; do';
echo ''; echo '';
echo ' if [ -f /tmp/.upgrading ]; then'; echo ' if [ -f /tmp/.upgrading ]; then';
echo ' if [ ! -f ~/letsencrypt_failed ]; then';
echo ' touch ~/letsencrypt_failed';
echo ' fi';
echo ' exit 0'; echo ' exit 0';
echo ' fi'; echo ' fi';
echo ''; echo '';