Skip to content

Commit 29e8972

Browse files
author
Kristan Kenney
committed
Merge branch 'fix/2020-10_fix_issue_rebuild' into staging/fixes
2 parents 47beb4f + 624270b commit 29e8972

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

bin/v-rebuild-web-domain

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ fi
7171
# Deleting backend configs
7272
if [ ! -z "$WEB_BACKEND" ]; then
7373
template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
74+
if [ -z "$template" ]; then
75+
template="default"
76+
update_object_value 'web' 'DOMAIN' "$domain" '$BACKEND' 'default'
77+
fi
7478
prepare_web_backend
7579
delete_web_backend
7680
$BIN/v-add-web-domain-backend $user $domain $template $restart

bin/v-rebuild-web-domains

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ fi
9595
# Starting rebuild loop for each web domain
9696
for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
9797
if [ ! -z "$WEB_BACKEND" ]; then
98-
template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
98+
template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND');
99+
if [ -z "$template" ]; then
100+
template="default"
101+
update_object_value 'web' 'DOMAIN' "$domain" '$BACKEND' 'default'
102+
fi
99103
$BIN/v-add-web-domain-backend $user $domain $template $restart
100104
fi
101105
rebuild_web_domain_conf

0 commit comments

Comments
 (0)