Skip to content

Commit 1077ee0

Browse files
author
Kristan Kenney
committed
Update naming convention for webmail scripts
1 parent 7f7b0ea commit 1077ee0

9 files changed

+10
-10
lines changed

bin/v-add-mail-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fi
132132
# Add webmail configuration to mail domain
133133
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
134134
if [ ! -z "$IMAP_SYSTEM" ]; then
135-
$BIN/v-add-webmail $user $domain ''
135+
$BIN/v-add-sys-webmail $user $domain ''
136136
fi
137137
fi
138138

File renamed without changes.

bin/v-change-sys-webmail

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ NEW_ALIAS=$1
2727
# Delete old webmail configuration
2828
for user in `ls /usr/local/hestia/data/users/`; do
2929
for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
30-
$BIN/v-delete-webmail $user $domain
30+
$BIN/v-delete-sys-webmail $user $domain
3131
done
3232
done
3333

@@ -36,7 +36,7 @@ $BIN/v-change-sys-config-value 'WEBMAIL_ALIAS' $NEW_ALIAS
3636

3737
for user in `ls /usr/local/hestia/data/users/`; do
3838
for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
39-
$BIN/v-add-webmail $user $domain
39+
$BIN/v-add-sys-webmail $user $domain
4040
done
4141
done
4242

bin/v-delete-mail-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fi
6969

7070
# Delete webmail configuration if it exists
7171
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
72-
$BIN/v-delete-webmail $user $domain 'yes'
72+
$BIN/v-delete-sys-webmail $user $domain 'yes'
7373
fi
7474

7575
#----------------------------------------------------------#

bin/v-rebuild-mail-domain

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ rebuild_mail_domain_conf
4646
# Rebuild webmail configuration
4747
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
4848
if [ ! -z "$IMAP_SYSTEM" ]; then
49-
$BIN/v-delete-webmail $user $domain ''
50-
$BIN/v-add-webmail $user $domain ''
49+
$BIN/v-delete-sys-webmail $user $domain ''
50+
$BIN/v-add-sys-webmail $user $domain ''
5151
fi
5252
fi
5353

bin/v-rebuild-mail-domains

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
5050
rebuild_mail_domain_conf
5151
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
5252
if [ ! -z "$IMAP_SYSTEM" ]; then
53-
$BIN/v-delete-webmail $user $domain ''
54-
$BIN/v-add-webmail $user $domain ''
53+
$BIN/v-delete-sys-webmail $user $domain ''
54+
$BIN/v-add-sys-webmail $user $domain ''
5555
fi
5656
fi
5757
done

bin/v-suspend-mail-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
4848
fi
4949

5050
# Removing webmail configuration
51-
$BIN/v-delete-webmail $user $domain 'yes'
51+
$BIN/v-delete-sys-webmail $user $domain 'yes'
5252

5353
#----------------------------------------------------------#
5454
# Hestia #

bin/v-unsuspend-mail-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ decrease_user_value "$user" '$SUSPENDED_MAIL'
5757

5858
# Enable webmail access
5959
if [ ! -z "$IMAP_SYSTEM" ]; then
60-
$BIN/v-add-webmail $user $domain 'yes'
60+
$BIN/v-add-sys-webmail $user $domain 'yes'
6161
fi
6262
# Logging
6363
log_event "$OK" "$ARGUMENTS"

0 commit comments

Comments
 (0)