Browse Source

Update naming convention for webmail scripts

Kristan Kenney 6 years ago
parent
commit
c03345fd7e

+ 1 - 1
bin/v-add-mail-domain

@@ -132,7 +132,7 @@ fi
 # Add webmail configuration to mail domain
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
     if [ ! -z "$IMAP_SYSTEM" ]; then
-        $BIN/v-add-webmail $user $domain ''
+        $BIN/v-add-sys-webmail $user $domain ''
     fi
 fi
     

+ 0 - 0
bin/v-add-webmail → bin/v-add-sys-webmail


+ 2 - 2
bin/v-change-sys-webmail

@@ -27,7 +27,7 @@ NEW_ALIAS=$1
 # Delete old webmail configuration
 for user in `ls /usr/local/hestia/data/users/`; do
     for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
-        $BIN/v-delete-webmail $user $domain
+        $BIN/v-delete-sys-webmail $user $domain
     done
 done
 
@@ -36,7 +36,7 @@ $BIN/v-change-sys-config-value 'WEBMAIL_ALIAS' $NEW_ALIAS
 
 for user in `ls /usr/local/hestia/data/users/`; do
     for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
-        $BIN/v-add-webmail $user $domain
+        $BIN/v-add-sys-webmail $user $domain
     done
 done
 

+ 1 - 1
bin/v-delete-mail-domain

@@ -69,7 +69,7 @@ fi
 
 # Delete webmail configuration if it exists
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
-    $BIN/v-delete-webmail $user $domain 'yes'
+    $BIN/v-delete-sys-webmail $user $domain 'yes'
 fi
 
 #----------------------------------------------------------#

+ 0 - 0
bin/v-delete-webmail → bin/v-delete-sys-webmail


+ 2 - 2
bin/v-rebuild-mail-domain

@@ -46,8 +46,8 @@ rebuild_mail_domain_conf
 # Rebuild webmail configuration
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
     if [ ! -z "$IMAP_SYSTEM" ]; then
-        $BIN/v-delete-webmail $user $domain ''
-        $BIN/v-add-webmail $user $domain ''
+        $BIN/v-delete-sys-webmail $user $domain ''
+        $BIN/v-add-sys-webmail $user $domain ''
     fi
 fi
 

+ 2 - 2
bin/v-rebuild-mail-domains

@@ -50,8 +50,8 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
     rebuild_mail_domain_conf
     if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
         if [ ! -z "$IMAP_SYSTEM" ]; then
-            $BIN/v-delete-webmail $user $domain ''
-            $BIN/v-add-webmail $user $domain ''
+            $BIN/v-delete-sys-webmail $user $domain ''
+            $BIN/v-add-sys-webmail $user $domain ''
         fi
     fi
 done

+ 1 - 1
bin/v-suspend-mail-domain

@@ -48,7 +48,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 fi
 
 # Removing webmail configuration
-$BIN/v-delete-webmail $user $domain 'yes'
+$BIN/v-delete-sys-webmail $user $domain 'yes'
 
 #----------------------------------------------------------#
 #                       Hestia                             #

+ 1 - 1
bin/v-unsuspend-mail-domain

@@ -57,7 +57,7 @@ decrease_user_value "$user" '$SUSPENDED_MAIL'
 
 # Enable webmail access
 if [ ! -z "$IMAP_SYSTEM" ]; then
-    $BIN/v-add-webmail $user $domain 'yes'
+    $BIN/v-add-sys-webmail $user $domain 'yes'
 fi
 # Logging
 log_event "$OK" "$ARGUMENTS"