github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 04:50:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making sure is always reseted in possible loops

Browse source
This commit is contained in:
dpeca 2017-03-14 01:56:28 +01:00
commit 56cdadbe5c
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
func/domain.sh
View file

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

5
func/rebuild.sh
View file

@ -227,9 +227,8 @@ rebuild_web_domain_conf() {
# Adding web stats parser # Adding web stats parser
if [ ! -z "$STATS" ]; then if [ ! -z "$STATS" ]; then
if [ -z "$domain_idn" ]; then domain_idn=$domain
format_domain_idn format_domain_idn
fi
cat $WEBTPL/$STATS/$STATS.tpl |\ cat $WEBTPL/$STATS/$STATS.tpl |\
sed -e "s|%ip%|$local_ip|g" \ sed -e "s|%ip%|$local_ip|g" \
-e "s|%web_system%|$WEB_SYSTEM|g" \ -e "s|%web_system%|$WEB_SYSTEM|g" \