Просмотр исходного кода

Change webmail routine in v-add-mail-domain

Call v-add-webmail script which references the necessary routines instead of calling the routines directly.
Kristan Kenney 6 лет назад
Родитель
Сommit
5bd65e28da
1 измененных файлов с 3 добавлено и 9 удалено
  1. 3 9
      bin/v-add-mail-domain

+ 3 - 9
bin/v-add-mail-domain

@@ -128,16 +128,10 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$dkim" = 'yes' ]; then
 fi
 fi
 
 
 # Add webmail configuration to mail domain
 # Add webmail configuration to mail domain
-WEBMAIL_TEMPLATE="default"
-if [ "$WEB_SYSTEM" = "nginx" ]; then
-    WEBMAIL_TEMPLATE="web_system"
+if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
+    $BIN/v-add-webmail $user $domain '' 
 fi
 fi
-add_webmail_config "$WEB_SYSTEM" "${WEBMAIL_TEMPLATE}.tpl"
-
-if [ ! -z "$PROXY_SYSTEM" ]; then
-    add_webmail_config "$PROXY_SYSTEM" "default.tpl"
-fi
-
+    
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                       Hestia                             #
 #                       Hestia                             #
 #----------------------------------------------------------#
 #----------------------------------------------------------#