Эх сурвалжийг харах

fix for huge alias number

Serghey Rodin 14 жил өмнө
parent
commit
b2db73ccca

+ 10 - 1
bin/v_change_web_domain_tpl

@@ -74,7 +74,16 @@ fi
 # Defining variables for template replace
 # Defining variables for template replace
 ip=$(get_web_domain_value '$IP')
 ip=$(get_web_domain_value '$IP')
 aliases=$(get_web_domain_value '$ALIAS')
 aliases=$(get_web_domain_value '$ALIAS')
-aliases_idn=$(idn -t --quiet -a "$aliases")
+i=1
+for dom_alias in ${aliases//,/ }; do
+    dom_alias=$(idn -t --quiet -a $dom_alias)
+    if [ "$i" -eq 1 ]; then
+        aliases_idn="$dom_alias"
+    else
+        aliases_idn="$aliases_idn,$dom_alias"
+    fi
+    i=$((i + 1))
+done
 web_port=$(get_config_value '$WEB_PORT')
 web_port=$(get_config_value '$WEB_PORT')
 email="$user@$domain"
 email="$user@$domain"
 docroot="$V_HOME/$user/web/$domain/public_html"
 docroot="$V_HOME/$user/web/$domain/public_html"

+ 10 - 1
bin/v_rebuild_web_domains

@@ -71,7 +71,16 @@ for domain in $domains; do
     docroot="$V_HOME/$user/web/$domain/public_html"
     docroot="$V_HOME/$user/web/$domain/public_html"
     email="$user@$domain"
     email="$user@$domain"
     aliases=$(get_web_domain_value '$ALIAS')
     aliases=$(get_web_domain_value '$ALIAS')
-    aliases_idn=$(idn -t --quiet -a "$aliases")
+    i=1
+    for dom_alias in ${aliases//,/ }; do
+        dom_alias=$(idn -t --quiet -a $dom_alias)
+        if [ "$i" -eq 1 ]; then
+            aliases_idn="$dom_alias"
+        else
+            aliases_idn="$aliases_idn,$dom_alias"
+        fi
+        i=$((i + 1))
+    done
     suspend=$(get_web_domain_value '$SUSPEND')
     suspend=$(get_web_domain_value '$SUSPEND')
 
 
     # Checking error log status
     # Checking error log status