github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 13:24:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes for exim antispam/antivirus protection

Browse source
This commit is contained in:
Serghey Rodin 2013-09-25 13:26:05 +03:00
commit 3f5f796637
7 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bin/v-add-mail-domain
View file

@ -47,7 +47,6 @@ is_package_full 'MAIL_DOMAINS'
mkdir $HOMEDIR/$user/conf/mail/$domain mkdir $HOMEDIR/$user/conf/mail/$domain
mkdir $HOMEDIR/$user/mail/$domain_idn mkdir $HOMEDIR/$user/mail/$domain_idn
touch $HOMEDIR/$user/conf/mail/$domain/aliases touch $HOMEDIR/$user/conf/mail/$domain/aliases
touch $HOMEDIR/$user/conf/mail/$domain/protection
touch $HOMEDIR/$user/conf/mail/$domain/passwd touch $HOMEDIR/$user/conf/mail/$domain/passwd
# Adding symlink # Adding symlink
@ -55,12 +54,12 @@ ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/$domain_idn
# Adding antispam protection # Adding antispam protection
if [ "$antispam" = 'yes' ]; then if [ "$antispam" = 'yes' ]; then
echo 'antispam' >> $HOMEDIR/$user/conf/mail/$domain/protection touch $HOMEDIR/$user/conf/mail/$domain/antispam
fi fi
# Adding antivirus protection # Adding antivirus protection
if [ "$antivirus" = 'yes' ]; then if [ "$antivirus" = 'yes' ]; then
echo 'antivirus' >> $HOMEDIR/$user/conf/mail/$domain/protection touch $HOMEDIR/$user/conf/mail/$domain/antivirus
fi fi
# Adding dkim # Adding dkim

7
bin/v-add-mail-domain-antispam
View file

@ -39,10 +39,9 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$ANTISPAM'
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Adding antispam key to config # Adding antispam flag
if [ -z "$(grep spam $HOMEDIR/$user/conf/mail/$domain/protection)" ]; then touch $HOMEDIR/$user/conf/mail/$domain/antispam
echo 'antispam' >> $HOMEDIR/$user/conf/mail/$domain/protection
fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Vesta # # Vesta #

6
bin/v-add-mail-domain-antivirus
View file

@ -39,10 +39,8 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS'
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Adding antivirus key to config # Adding antivirus flag
if [ -z "$(grep 'virus' $HOMEDIR/$user/conf/mail/$domain/protection)" ]; then touch $HOMEDIR/$user/conf/mail/$domain/antivirus
echo 'antivirus' >> $HOMEDIR/$user/conf/mail/$domain/protection
fi
#----------------------------------------------------------# #----------------------------------------------------------#

4
bin/v-delete-mail-domain-antispam
View file

@ -39,8 +39,8 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$ANTISPAM'
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Delete antispam key # Delete antispam flag
sed -i "/antispam/d" $HOMEDIR/$user/conf/mail/$domain/protection rm -f $HOMEDIR/$user/conf/mail/$domain/antispam
#----------------------------------------------------------# #----------------------------------------------------------#

4
bin/v-delete-mail-domain-antivirus
View file

@ -39,8 +39,8 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS'
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Delete antivirus key # Delete antivirus flag
sed -i "/antivirus/d" $HOMEDIR/$user/conf/mail/$domain/protection rm -f $HOMEDIR/$user/conf/mail/$domain/antivirus
#----------------------------------------------------------# #----------------------------------------------------------#

7
func/rebuild.sh
View file

@ -418,20 +418,21 @@ rebuild_mail_domain_conf() {
ln -s $HOMEDIR/$user/conf/mail/$domain \ ln -s $HOMEDIR/$user/conf/mail/$domain \
/etc/$MAIL_SYSTEM/domains/$domain_idn /etc/$MAIL_SYSTEM/domains/$domain_idn
rm -f $HOMEDIR/$user/conf/mail/$domain/aliases rm -f $HOMEDIR/$user/conf/mail/$domain/aliases
rm -f $HOMEDIR/$user/conf/mail/$domain/antispam
rm -f $HOMEDIR/$user/conf/mail/$domain/antivirus
rm -f $HOMEDIR/$user/conf/mail/$domain/protection rm -f $HOMEDIR/$user/conf/mail/$domain/protection
rm -f $HOMEDIR/$user/conf/mail/$domain/passwd rm -f $HOMEDIR/$user/conf/mail/$domain/passwd
touch $HOMEDIR/$user/conf/mail/$domain/aliases touch $HOMEDIR/$user/conf/mail/$domain/aliases
touch $HOMEDIR/$user/conf/mail/$domain/protection
touch $HOMEDIR/$user/conf/mail/$domain/passwd touch $HOMEDIR/$user/conf/mail/$domain/passwd
# Adding antispam protection # Adding antispam protection
if [ "$ANTISPAM" = 'yes' ]; then if [ "$ANTISPAM" = 'yes' ]; then
echo 'antispam' >> $HOMEDIR/$user/conf/mail/$domain/protection touch $HOMEDIR/$user/conf/mail/$domain/antispam
fi fi
# Adding antivirus protection # Adding antivirus protection
if [ "$ANTIVIRUS" = 'yes' ]; then if [ "$ANTIVIRUS" = 'yes' ]; then
echo 'antivirus' >> $HOMEDIR/$user/conf/mail/$domain/protection touch $HOMEDIR/$user/conf/mail/$domain/antivirus
fi fi
# Adding dkim # Adding dkim

2
install/rhel/exim.conf
View file

@ -1,6 +1,6 @@
########################################################################## ##########################################################################
#SPAMASSASSIN = yes #SPAMASSASSIN = yes
SPAM_SCORE = 10 SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
########################################################################## ##########################################################################