github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-22 14:24:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8397943b3c into bba7400b8a

Browse source
This commit is contained in:
Александр Кунич 2021-01-20 02:04:47 +01:00 • committed by GitHub
commit 42ed5b28fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,8 @@ get_domain_values 'web'
# check if alias is the letsencrypt wildcard domain, if not, make the normal checks # check if alias is the letsencrypt wildcard domain, if not, make the normal checks
if [[ "$aliases" != "*.$domain" ]]; then if [[ "$aliases" != "*.$domain" ]]; then
for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do
check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)" alias_unicode=`idn -t --quiet -u $alias`
check_alias="$(echo $ALIAS |tr ',' '\n' |egrep ^$alias\|$alias_unicode$)"
if [ -z "$check_alias" ]; then if [ -z "$check_alias" ]; then
check_result $E_NOTEXIST "domain alias $alias doesn't exist" check_result $E_NOTEXIST "domain alias $alias doesn't exist"
fi fi
@ -158,6 +159,7 @@ for auth in $authz; do
$BIN/v-delete-dns-record $user $domain $old_record $BIN/v-delete-dns-record $user $domain $old_record
done done
$BIN/v-add-dns-record $user $domain "_acme-challenge" "TXT" $record $BIN/v-add-dns-record $user $domain "_acme-challenge" "TXT" $record
$BIN/v-update-sys-queue dns-cluster
check_result $? "DNS _acme-challenge record wasn't created" check_result $? "DNS _acme-challenge record wasn't created"
else else
if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then