Quellcode durchsuchen

Correcting wildcard, thanks to @skullwritter

Raphael Schneeberger vor 6 Jahren
Ursprung
Commit
bb0f1d8cf1
1 geänderte Dateien mit 9 neuen und 6 gelöschten Zeilen
  1. 9 6
      bin/v-add-letsencrypt-domain

+ 9 - 6
bin/v-add-letsencrypt-domain

@@ -68,12 +68,15 @@ if [ -z "$mail" ]; then
     is_object_valid 'web' 'DOMAIN' "$domain"
     is_object_unsuspended 'web' 'DOMAIN' "$domain"
     get_domain_values 'web'
-    for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do
-        check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)"
-        if [ -z "$check_alias" ]; then
-            check_result $E_NOTEXIST "domain alias $alias doesn't exist"
-        fi
-    done
+    # 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$)"
+            if [ -z "$check_alias" ]; then
+                check_result $E_NOTEXIST "domain alias $alias doesn't exist"
+            fi
+        done
+    fi;
 else
     is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
     is_object_valid 'mail' 'DOMAIN' "$domain"