|
@@ -52,8 +52,11 @@ salt=$(generate_password "$PW_MATRIX" "8")
|
|
|
md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
|
|
md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
|
|
|
|
|
|
|
|
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
|
|
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
|
|
|
|
|
+ quota=$(grep $account $VESTA/data/users/${user}/mail/${domain}.conf)
|
|
|
|
|
+ quota=$(echo $quota | awk '{ print $7 }' | sed -e "s/'//g" )
|
|
|
|
|
+ quota=$(echo $quota | cut -d "=" -f 2 | sed -e "s/unlimited/0/g")
|
|
|
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
|
|
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
|
|
|
- str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
|
|
|
|
|
|
|
+ str="$account:$md5:$user:mail::$HOMEDIR/$user:${quota}M"
|
|
|
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
|
|
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
|
|
|
fi
|
|
fi
|
|
|
|
|
|