Remove old domain configuration files during rebuild

Author: Kristan Kenney

func/domain.sh

@@ -230,8 +230,11 @@ add_web_config() {
     chmod 640 $conf
 
     if [ "$1" != 'nginx' ]; then
+        rm -f /etc/$1/conf.d/domains/$domain.conf
         ln -s $HOMEDIR/$user/conf/web/$domain/$1.conf /etc/$1/conf.d/domains/$domain.conf
+
     else
+        rm -f /etc/$1/conf.d/domains/$domain.conf
         ln -s $HOMEDIR/$user/conf/web/$domain/$1.conf /etc/$1/conf.d/domains/$domain.conf
     fi
 

func/rebuild.sh

@@ -148,7 +148,6 @@ rebuild_user_conf() {
 rebuild_web_domain_conf() {
 
     # Ensure that global domain folders are available
-    
     if [ ! -d /etc/$WEB_SYSTEM/conf.d/domains ]; then
         mkdir -p /etc/$WEB_SYSTEM/conf.d/domains
     fi
@@ -160,6 +159,14 @@ rebuild_web_domain_conf() {
     is_ip_valid $IP
     prepare_web_domain_values
 
+    # Remove old web configuration files
+    if [ -f /etc/$PROXY_SYSTEM/conf.d/$domain.conf ]; then
+        rm -f /etc/$PROXY_SYSTEM/conf.d/$domain*.conf
+    fi
+    if [ -f /etc/$WEB_SYSTEM/conf.d/$domain.conf ]; then
+        rm -f /etc/$WEB_SYSTEM/conf.d/$domain*.conf
+    fi
+
     # Rebuilding domain directories
     mkdir -p $HOMEDIR/$user/web/$domain \
         $HOMEDIR/$user/web/$domain/public_html \