Skip to content

Commit c60198f

Browse files
author
Kristan Kenney
committed
Update domain deletion function
1 parent cacc57f commit c60198f

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

func/domain.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,10 @@ del_web_config() {
299299
conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
300300
fi
301301

302+
# Remove domain configuration files and clean up symbolic links
303+
rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf
304+
rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.conf
305+
302306
# Clean up legacy configuration files
303307
if [ -e "$conf" ]; then
304308
sed -i "\|$conf|d" /etc/$1/conf.d/hestia.conf
@@ -321,13 +325,6 @@ del_web_config() {
321325
fi
322326
fi
323327

324-
# Remove domain file symbolic links
325-
if [ -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf ]; then
326-
rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain*.conf
327-
fi
328-
if [ -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.conf ]; then
329-
rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain*.conf
330-
fi
331328
}
332329

333330
# SSL certificate verification

0 commit comments

Comments
 (0)