From 36a4e9372b69d2fbe3b51d2fed6d72c75a09f191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9A=D1=83=D0=BD=D0=B8=D1=87?= Date: Thu, 22 Aug 2019 10:03:57 +0300 Subject: [PATCH 1/2] Fix Lets encrypt update certificate for unicode aliases --- bin/v-add-letsencrypt-domain | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/v-add-letsencrypt-domain b/bin/v-add-letsencrypt-domain index 6a12af87f..7f7bb586e 100755 --- a/bin/v-add-letsencrypt-domain +++ b/bin/v-add-letsencrypt-domain @@ -73,7 +73,8 @@ get_domain_values 'web' # check if alias is the letsencrypt wildcard domain, if not, make the normal checks if [[ "$aliases" != "*.$domain" ]]; then 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 check_result $E_NOTEXIST "domain alias $alias doesn't exist" fi From 8397943b3c3619b196a076a3bab87219873609d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9A=D1=83=D0=BD=D0=B8=D1=87?= Date: Thu, 10 Sep 2020 16:12:53 +0300 Subject: [PATCH 2/2] Fix: Update dns cluster before Requesting ACME validation to wildcard certificate --- bin/v-add-letsencrypt-domain | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/v-add-letsencrypt-domain b/bin/v-add-letsencrypt-domain index 401e6eab2..def94c27d 100755 --- a/bin/v-add-letsencrypt-domain +++ b/bin/v-add-letsencrypt-domain @@ -156,6 +156,7 @@ for auth in $authz; do $BIN/v-delete-dns-record $user $domain $old_record done $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" else if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then