Skip to content

Commit 9bf6b7f

Browse files
committed
BugFix: When using nginx as proxy for apache, editing web alias would remove domain configs from apache2 conf.d folder
- del_web_config should remove only selected config (web or proxy, http or https) not all of them since add_web_config creates a single config file
1 parent edf1ed3 commit 9bf6b7f

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

func/domain.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -294,27 +294,27 @@ replace_web_config() {
294294
# Delete web configuration
295295
del_web_config() {
296296
conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
297+
local confname="$domain.conf"
297298
if [[ "$2" =~ stpl$ ]]; then
298299
conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
300+
confname="$domain.ssl.conf"
299301
fi
300302

301303
# Remove domain configuration files and clean up symbolic links
302-
if [ ! -z "$WEB_SYSTEM" ]; then
303-
rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf
304-
rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.ssl.conf
304+
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" = "$1" ]; then
305+
rm -f "/etc/$WEB_SYSTEM/conf.d/domains/$confname"
305306
fi
306-
if [ ! -z "$PROXY_SYSTEM" ]; then
307-
rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.conf
308-
rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.ssl.conf
307+
if [ ! -z "$PROXY_SYSTEM" ] && [ "$PROXY_SYSTEM" = "$1" ]; then
308+
rm -f "/etc/$PROXY_SYSTEM/conf.d/domains/$confname"
309309
fi
310310

311311
# Clean up legacy configuration files
312312
if [ ! -e "$conf" ]; then
313-
conf="$HOMEDIR/$user/conf/web/$1.conf"
313+
local legacyconf="$HOMEDIR/$user/conf/web/$1.conf"
314314
if [[ "$2" =~ stpl$ ]]; then
315-
conf="$HOMEDIR/$user/conf/web/s$1.conf"
315+
legacyconf="$HOMEDIR/$user/conf/web/s$1.conf"
316316
fi
317-
rm -f $conf
317+
rm -f $legacyconf
318318

319319
# Remove old global includes file
320320
rm -f /etc/$1/conf.d/hestia.conf

0 commit comments

Comments
 (0)