@@ -51,6 +51,7 @@ get_domain_values 'web'
5151# Registering LetsEncrypt user account
5252$BIN /v-add-letsencrypt-user $user
5353if [ " $? " -ne 0 ]; then
54+ sed -i " / $domain /d" $VESTA /data/queue/letsencrypt.pipe
5455 send_notice " LETSENCRYPT" " Account registration failed"
5556 check_result $E_CONNECT " LE account registration" > /dev/null
5657fi
6465for alias in $( echo $domain ,$aliases | tr ' ,' ' \n' | sort -u) ; do
6566 $BIN /v-check-letsencrypt-domain $user $alias
6667 if [ " $? " -ne 0 ]; then
68+ sed -i " / $domain /d" $VESTA /data/queue/letsencrypt.pipe
6769 send_notice " LETSENCRYPT" " $alias validation failed"
6870 check_result $E_INVALID " LE domain validation" > /dev/null
6971 fi
7072
7173 # Checking LE limits per account
7274 if [ " $i " -gt 100 ]; then
75+ sed -i " / $domain /d" $VESTA /data/queue/letsencrypt.pipe
7376 send_notice ' LETSENCRYPT' ' Limit of domains per account is reached'
7477 check_result $E_LIMIT " LE can't sign more than 100 domains"
7578 fi
7679 i=$(( i++ ))
7780done
78- exit
81+
7982# Generating CSR
8083ssl_dir=$( $BIN /v-generate-ssl-cert " $domain " " $email " " US" " California" \
8184 " San Francisco" " Vesta" " IT" " $aliases " | tail -n1 | awk ' {print $2}' )
8285
8386# Signing CSR
8487crt=$( $BIN /v-sign-letsencrypt-csr $user $domain $ssl_dir )
8588if [ " $? " -ne 0 ]; then
89+ sed -i " / $domain /d" $VESTA /data/queue/letsencrypt.pipe
8690 send_notice " LETSENCRYPT" " $alias validation failed"
8791 check_result " $E_INVALID " " LE $domain validation"
8892fi
103107$BIN /v-delete-web-domain-ssl $user $domain > /dev/null 2>&1
104108$BIN /v-add-web-domain-ssl $user $domain $ssl_dir
105109if [ " $? " -ne ' 0' ]; then
110+ sed -i " / $domain /d" $VESTA /data/queue/letsencrypt.pipe
106111 send_notice ' LETSENCRYPT' " $domain certificate installation failed"
107112 check_result $? " SSL install" > /dev/null
108113fi
127132# Notifying user
128133send_notice ' LETSENCRYPT' " $domain SSL has been installed successfully"
129134
135+ # Deleteing task from queue
136+ sed -i " / $domain /d" $VESTA /data/queue/letsencrypt.pipe
137+
130138# Logging
131139log_event " $OK " " $ARGUMENTS "
132140
0 commit comments