Skip to content

Commit 18d0254

Browse files
committed
[Fix] Preserve email quota when (un)suspending and rebuilding mail accounts
Completes PR hestiacp#670
1 parent ca4c8b5 commit 18d0254

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bin/v-suspend-mail-account

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
5454
quota=0
5555
fi
5656
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
57-
str="$account:SUSPENDED:$user:mail::$HOMEDIR/$user:$quota"
57+
str="$account:SUSPENDED:$user:mail::$HOMEDIR/$user::userdb_quota_rule=*:storage=${quota}M"
5858
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
5959
fi
6060

bin/v-unsuspend-mail-account

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
5252
quota=0
5353
fi
5454
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
55-
str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
55+
str="$account:$md5:$user:mail::$HOMEDIR/$user::userdb_quota_rule=*:storage=${quota}M"
5656
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
5757
fi
5858

func/rebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ rebuild_mail_domain_conf() {
557557
if [ "$QUOTA" = 'unlimited' ]; then
558558
QUOTA=0
559559
fi
560-
str="$account:$MD5:$user:mail::$HOMEDIR/$user:$QUOTA"
560+
str="$account:$MD5:$user:mail::$HOMEDIR/$user::userdb_quota_rule=*:storage=${QUOTA}M"
561561
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
562562
for malias in ${ALIAS//,/ }; do
563563
echo "$malias@$domain_idn:$account@$domain_idn" >> $dom_aliases

0 commit comments

Comments
 (0)