|
|
@@ -172,9 +172,8 @@ add_web_config() {
|
|
|
conf="$HOMEDIR/$user/conf/web/s$1.conf"
|
|
|
fi
|
|
|
|
|
|
- if [ -z "$domain_idn" ]; then
|
|
|
- format_domain_idn
|
|
|
- fi
|
|
|
+ domain_idn=$domain
|
|
|
+ format_domain_idn
|
|
|
|
|
|
cat $WEBTPL/$1/$WEB_BACKEND/$2 | \
|
|
|
sed -e "s|%ip%|$local_ip|g" \
|
|
|
@@ -232,9 +231,8 @@ get_web_config_lines() {
|
|
|
check_result $E_PARSING "can't parse template $1"
|
|
|
fi
|
|
|
|
|
|
- if [ -z "$domain_idn" ]; then
|
|
|
- format_domain_idn
|
|
|
- fi
|
|
|
+ domain_idn=$domain
|
|
|
+ format_domain_idn
|
|
|
vhost_lines=$(grep -niF "name $domain_idn" $2)
|
|
|
vhost_lines=$(echo "$vhost_lines" |egrep "$domain_idn($| |;)") #"
|
|
|
vhost_lines=$(echo "$vhost_lines" |cut -f 1 -d :)
|