diff --git a/bin/v-add-letsencrypt-domain b/bin/v-add-letsencrypt-domain index 298506f7e..9b900b71b 100755 --- a/bin/v-add-letsencrypt-domain +++ b/bin/v-add-letsencrypt-domain @@ -112,6 +112,14 @@ if [ "$?" -ne '0' ]; then check_result $? "SSL install" >/dev/null fi +# Adding LE autorenew cronjob +if [ -z "$(grep v-update-lets $VESTA/data/users/admin/cron.conf)" ]; then + min=$(generate_password '012345' '2') + hour=$(generate_password '1234567' '1') + cmd="sudo $BIN/v-update-letsencrypt-ssl" + $BIN/v-add-cron-job admin "$min" "$hour" '*' '*' '*' "$cmd" > /dev/null +fi + # Updating letsencrypt key if [ -z "$LETSENCRYPT" ]; then add_object_key "web" 'DOMAIN' "$domain" 'LETSENCRYPT' 'FTP_USER' diff --git a/bin/v-update-letsencrypt-ssl b/bin/v-update-letsencrypt-ssl index 76e5fee45..fc08b7bb3 100755 --- a/bin/v-update-letsencrypt-ssl +++ b/bin/v-update-letsencrypt-ssl @@ -30,10 +30,9 @@ for user in $users; do USER_DATA=$VESTA/data/users/$user # Checking user certificates for domain in $(search_objects 'web' 'LETSENCRYPT' 'yes' 'DOMAIN'); do - crt="$VESTA/data/users/$user/ssl/$domain.crt" - # Checking certificate issuer - crt_data=$(openssl x509 -text -in "$crt") + crt="$VESTA/data/users/$user/ssl/$domain.crt" + crt_data=$(openssl x509 -text -in "$crt") expire=$(echo "$crt_data" |grep "Not After") expire=$(echo "$expire" |cut -f 2,3,4 -d :) expire=$(date -d "$expire" +%s)