Merge pull request #1896 from millsy/master

Switched to egrep to support optional comma in renewal
This commit is contained in:
Serghey Rodin
2019-08-08 14:24:36 +03:00
committed by GitHub

View File

@@ -43,7 +43,7 @@ for user in $($BIN/v-list-users plain |cut -f 1); do
aliases=$(echo "$crt_data" |grep DNS:)
aliases=$(echo "$aliases" |sed -e "s/DNS://g" -e "s/,//g")
aliases=$(echo "$aliases" |tr ' ' '\n' |sed "/^$/d")
aliases=$(echo "$aliases" |grep -v "^$domain,$")
aliases=$(echo "$aliases" |egrep -v "^$domain,?$")
aliases=$(echo "$aliases" |sed -e ':a;N;$!ba;s/\n/,/g')
msg=$($BIN/v-add-letsencrypt-domain $user $domain $aliases)
if [ $? -ne 0 ]; then