Преглед на файлове

Merge pull request #1896 from millsy/master

Switched to egrep to support optional comma in renewal
Serghey Rodin преди 6 години
родител
ревизия
015acfc168
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      bin/v-update-letsencrypt-ssl

+ 1 - 1
bin/v-update-letsencrypt-ssl

@@ -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