Browse Source

#1322 Some older templates has the “backend” var missing in web.conf

Jaap Marcus 5 years ago
parent
commit
624270b04b
2 changed files with 9 additions and 1 deletions
  1. 4 0
      bin/v-rebuild-web-domain
  2. 5 1
      bin/v-rebuild-web-domains

+ 4 - 0
bin/v-rebuild-web-domain

@@ -71,6 +71,10 @@ fi
 # Deleting backend configs
 if [ ! -z "$WEB_BACKEND" ]; then
     template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
+    if [ -z "$template" ]; then 
+        template="default"
+        update_object_value 'web' 'DOMAIN' "$domain" '$BACKEND' 'default'  
+    fi
     prepare_web_backend
     delete_web_backend
     $BIN/v-add-web-domain-backend $user $domain $template $restart

+ 5 - 1
bin/v-rebuild-web-domains

@@ -95,7 +95,11 @@ fi
 # Starting rebuild loop for each web domain
 for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
     if [ ! -z "$WEB_BACKEND" ]; then
-        template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
+        template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND');
+        if [ -z "$template" ]; then 
+            template="default"
+            update_object_value 'web' 'DOMAIN' "$domain" '$BACKEND' 'default'  
+        fi
         $BIN/v-add-web-domain-backend $user $domain $template $restart
     fi
     rebuild_web_domain_conf