Ensure global domain configurations are removed during rebuild

Author: Kristan Kenney

bin/v-rebuild-web-domains

@@ -38,23 +38,28 @@ is_object_unsuspended 'user' 'USER' "$user"
 
 # Deleting old web configs
 sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/hestia.conf
+
 if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf"  ]; then
-    rm $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
+    rm -f $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
+    rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf
 fi
 if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf" ]; then
     rm $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf
+    rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.ssl.conf
 fi
 
 # Deleting old proxy configs
 if [ ! -z "$PROXY_SYSTEM" ]; then
     sed -i "/.*\/$user\/conf\/web\//d" /etc/$PROXY_SYSTEM/conf.d/hestia.conf
 
     if [ -e "$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf" ]; then
-        rm $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf
+        rm -f $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf
+        rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.conf
     fi
 
     if [ -e "$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf" ]; then
-        rm $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf
+        rm -f $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf
+        rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.ssl.conf
     fi
 fi