github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #32 from serghey-rodin/master

Browse source 
update from master
This commit is contained in:
myvesta 2018-12-10 14:32:33 +01:00 • committed by GitHub
commit 7d6fcbd634
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bin/v-update-letsencrypt-ssl
View file

@ -25,14 +25,15 @@ source $VESTA/conf/vesta.conf
# Defining user list # Defining user list
users=$($BIN/v-list-users | tail -n+3 | awk '{ print $1 }') users=$($BIN/v-list-users | tail -n+3 | awk '{ print $1 }')
lecounter=0
# Checking users # Checking users
for user in $users; do for user in $users; do
USER_DATA=$VESTA/data/users/$user USER_DATA=$VESTA/data/users/$user
# Checking user certificates # Checking user certificates
lecounter=0
for domain in $(search_objects 'web' 'LETSENCRYPT' 'yes' 'DOMAIN'); do for domain in $(search_objects 'web' 'LETSENCRYPT' 'yes' 'DOMAIN'); do
# Working on Web domain check - if is suspended # Working on Web domain check - if is suspended
webSuspended=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf |grep "SUSPENDED='no") webSuspended=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf |grep "SUSPENDED='yes")
if [ ! -z "$webSuspended" ]; then if [ ! -z "$webSuspended" ]; then
continue; continue;
fi; fi;
@ -46,6 +47,10 @@ for user in $users; do
expire=$((expire / 86400)) expire=$((expire / 86400))
domain=$(basename $crt |sed -e "s/.crt$//") domain=$(basename $crt |sed -e "s/.crt$//")
if [[ "$expire" -lt 31 ]]; then if [[ "$expire" -lt 31 ]]; then
if [ $lecounter -gt 0 ]; then
sleep 10
fi
((lecounter++))
aliases=$(echo "$crt_data" |grep DNS:) aliases=$(echo "$crt_data" |grep DNS:)
aliases=$(echo "$aliases" |sed -e "s/DNS://g" -e "s/,//") aliases=$(echo "$aliases" |sed -e "s/DNS://g" -e "s/,//")
aliases=$(echo "$aliases" |tr ' ' '\n' |sed "/^$/d") aliases=$(echo "$aliases" |tr ' ' '\n' |sed "/^$/d")