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

Merge pull request #1870 from skullwritter/patch-11

Browse source 
correcting wildcat
This commit is contained in:
Serghey Rodin 2019-05-14 10:23:33 +03:00 • committed by GitHub
commit 7f82e42cc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bin/v-add-letsencrypt-domain
View file

@ -62,13 +62,15 @@ is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain" is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain" is_object_unsuspended 'web' 'DOMAIN' "$domain"
get_domain_values 'web' get_domain_values 'web'
for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do # check if alias is the letsencrypt wildcard domain, if not, make the normal checks
check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)" if [[ "$aliases" != "*.$domain" ]]; then
if [ -z "$check_alias" ]; then for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do
check_result $E_NOTEXIST "domain alias $alias doesn't exist" check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)"
fi if [ -z "$check_alias" ]; then
done check_result $E_NOTEXIST "domain alias $alias doesn't exist"
fi
done
fi;
#----------------------------------------------------------# #----------------------------------------------------------#
# Action # # Action #