Skip to content

Commit 59abdee

Browse files
committed
fix for nginxless configuration
1 parent 31ef502 commit 59abdee

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

bin/v-rebuild-web-domains

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if [ "$domain_counter" -lt 1 ]; then
6969
# Deleting web configs
7070
rm -f $HOMEDIR/$user/conf/web/*
7171
sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $web_conf
72-
if [ -e "$proxy_conf" ]; then
72+
if [ ! -z "$PROXY_SYSTEM" ]; then
7373
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
7474
fi
7575

@@ -103,34 +103,35 @@ else
103103
fi
104104

105105
# Checking proxy
106-
if [ "$proxy_change" = 'yes' ]; then
107-
tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
108-
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
109-
mv $tmp_conf $conf
110-
proxy_include=$(grep "$conf" $proxy_conf )
111-
if [ -z "$proxy_include" ]; then
112-
echo "include $conf;" >> $proxy_conf
106+
if [ ! -z "$PROXY_SYSTEM" ]; then
107+
if [ "$proxy_change" = 'yes' ]; then
108+
tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
109+
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
110+
mv $tmp_conf $conf
111+
proxy_include=$(grep "$conf" $proxy_conf )
112+
if [ -z "$proxy_include" ]; then
113+
echo "include $conf;" >> $proxy_conf
114+
fi
115+
else
116+
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
117+
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
118+
rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
113119
fi
114-
else
115-
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
116-
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
117-
rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
118-
fi
119120

120-
# Checking SSL proxy
121-
if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then
122-
tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
123-
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
124-
mv $tmp_conf $conf
125-
proxy_include=$(grep "$conf" $proxy_conf )
126-
if [ -z "$proxy_include" ]; then
127-
echo "include $conf;" >> $proxy_conf
121+
# Checking SSL proxy
122+
if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then
123+
tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
124+
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
125+
mv $tmp_conf $conf
126+
proxy_include=$(grep "$conf" $proxy_conf )
127+
if [ -z "$proxy_include" ]; then
128+
echo "include $conf;" >> $proxy_conf
129+
fi
130+
else
131+
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
132+
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
133+
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
128134
fi
129-
else
130-
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
131-
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
132-
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
133-
134135
fi
135136
fi
136137

0 commit comments

Comments
 (0)