From b40bad31ea18743966317ba11e14bf2ee7b36a2f Mon Sep 17 00:00:00 2001
From: "Made I.T" <info@madeit.be>
Date: Mon, 23 Oct 2017 14:25:24 +0200
Subject: [PATCH] Update v-change-web-domain-backend-tpl

---
 bin/v-change-web-domain-backend-tpl | 90 ++++++++++++++++++++++++-----
 1 file changed, 76 insertions(+), 14 deletions(-)

diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl
index 8fc24f86..1237031c 100755
--- a/bin/v-change-web-domain-backend-tpl
+++ b/bin/v-change-web-domain-backend-tpl
@@ -78,29 +78,59 @@ if [ "$backend_type" = "$user" ]; then
     for domain in $(shell_list); do
         get_domain_values 'web'
         local_ip=$(get_real_ip $IP)
-        prepare_web_domain_values
+        ipv6=$IP6
+        
+        # Deleting vhost configuration IPv4
+        if [ ! -z "$local_ip" ]; then
+            old=$local_ip
+            # Deleting proxy
+            del_web_config "$WEB_SYSTEM" "$TPL.tpl"
+            if [ "$SSL" = 'yes' ]; then
+                del_web_config "$WEB_SYSTEM" "$TPL.stpl"
+            fi
+            
+            if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
+                del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
+                if [ "$SSL" = 'yes' ]; then
+                    del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
+                fi
+            fi
+        fi
 
-        # Rebuilding vhost
-        del_web_config "$WEB_SYSTEM" "$TPL.tpl"
+        # Deleting vhost configuration IPv6
+        if [ ! -z "$IP6" ]; then
+            old=$IP6
+
+            del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
+            if [ "$SSL" = 'yes' ]; then
+                del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
+            fi
+            
+            if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
+                del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
+                if [ "$SSL" = 'yes' ]; then
+                    del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
+                fi
+            fi
+        fi
+        
+        prepare_web_domain_values
         add_web_config "$WEB_SYSTEM" "$TPL.tpl"
         if [ "$SSL" = 'yes' ]; then
-            del_web_config "$WEB_SYSTEM" "$TPL.stpl"
             add_web_config "$WEB_SYSTEM" "$TPL.stpl"
         fi
 
         # Rebuilding proxy configuration
         if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
-            del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
             add_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
             if [ "$SSL" = 'yes' ]; then
-                del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
                 add_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
             fi
         fi
 
         # Update config
-        add_object_key "web" 'DOMAIN' "$domain" 'BACKEND' 'PROXY'
-        update_object_value 'web' 'DOMAIN' "$domain" '$BACKEND' "$template"
+        add_object_key "web" 'DOMAIN' "$domain_idn" 'BACKEND' 'PROXY'
+        update_object_value 'web' 'DOMAIN' "$domain_idn" '$BACKEND' "$template"
     done
 
     # Chaning template in user config
@@ -115,29 +145,61 @@ else
     # Parsing domain values
     get_domain_values 'web'
     local_ip=$(get_real_ip $IP)
+    ipv6=$IP6
+        
+    # Deleting vhost configuration IPv4
+    if [ ! -z "$local_ip" ]; then
+        old=$local_ip
+        # Deleting proxy
+        del_web_config "$WEB_SYSTEM" "$TPL.tpl"
+        if [ "$SSL" = 'yes' ]; then
+            del_web_config "$WEB_SYSTEM" "$TPL.stpl"
+        fi
+
+        if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
+            del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
+            if [ "$SSL" = 'yes' ]; then
+                del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
+            fi
+        fi
+    fi
+
+    # Deleting vhost configuration IPv6
+    if [ ! -z "$IP6" ]; then
+        old=$IP6
+
+        del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
+        if [ "$SSL" = 'yes' ]; then
+            del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
+        fi
+
+        if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
+            del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
+            if [ "$SSL" = 'yes' ]; then
+                del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
+            fi
+        fi
+    fi
+    
     prepare_web_domain_values
 
     # Rebuilding vhost
-    del_web_config "$WEB_SYSTEM" "$TPL.tpl"
     add_web_config "$WEB_SYSTEM" "$TPL.tpl"
     if [ "$SSL" = 'yes' ]; then
-        del_web_config "$WEB_SYSTEM" "$TPL.stpl"
         add_web_config "$WEB_SYSTEM" "$TPL.stpl"
     fi
 
     # Rebuilding proxy configuration
     if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
-        del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
         add_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
         if [ "$SSL" = 'yes' ]; then
-            del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
             add_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
         fi
     fi
 
     # Update config
-    add_object_key "web" 'DOMAIN' "$domain" 'BACKEND' 'PROXY'
-    update_object_value 'web' 'DOMAIN' "$domain" '$BACKEND' "$template"
+    add_object_key "web" 'DOMAIN' "$domain_idn" 'BACKEND' 'PROXY'
+    update_object_value 'web' 'DOMAIN' "$domain_idn" '$BACKEND' "$template"
 fi