github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-14 00:53:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1896 from millsy/master

Browse source 
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
commit 015acfc168
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-update-letsencrypt-ssl
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 "$crt_data" |grep DNS:)
aliases=$(echo "$aliases" |sed -e "s/DNS://g" -e "s/,//g") aliases=$(echo "$aliases" |sed -e "s/DNS://g" -e "s/,//g")
aliases=$(echo "$aliases" |tr ' ' '\n' |sed "/^$/d") 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') aliases=$(echo "$aliases" |sed -e ':a;N;$!ba;s/\n/,/g')
msg=$($BIN/v-add-letsencrypt-domain $user $domain $aliases) msg=$($BIN/v-add-letsencrypt-domain $user $domain $aliases)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then