Răsfoiți Sursa

Fix: removing the domain object from web.conf breaks scripts that check if the web domain is present (v-delete-web-domain-ssl-force in this case)

Robert Zollner 5 ani în urmă
părinte
comite
cb1659befe
1 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 3 3
      bin/v-delete-web-domain

+ 3 - 3
bin/v-delete-web-domain

@@ -66,9 +66,6 @@ if [ ! -z "$WEB_BACKEND" ]; then
     $BIN/v-delete-web-domain-backend $user $domain $restart
     $BIN/v-delete-web-domain-backend $user $domain $restart
 fi
 fi
 
 
-# Deleting domain from web.conf
-sed -i "/DOMAIN='$domain'/ d" $USER_DATA/web.conf
-
 # Deleting vhost configuration
 # Deleting vhost configuration
 del_web_config "$WEB_SYSTEM" "$TPL.tpl"
 del_web_config "$WEB_SYSTEM" "$TPL.tpl"
 
 
@@ -80,6 +77,9 @@ if [ "$SSL" = 'yes' ]; then
     rm -f $USER_DATA/ssl/$domain.*
     rm -f $USER_DATA/ssl/$domain.*
 fi
 fi
 
 
+# Deleting domain from web.conf
+sed -i "/DOMAIN='$domain'/ d" $USER_DATA/web.conf
+
 # Deleting proxy
 # Deleting proxy
 if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
 if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
     del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"