diff --git a/install_amavis.sh b/install_amavis.sh index 40f1453..0de2eff 100755 --- a/install_amavis.sh +++ b/install_amavis.sh @@ -1695,7 +1695,7 @@ echo -e " \033[37m\033[1mConfigure Spamassassin..\033[m" ## - _config_file=/etc/spamassassin/local.cf if [[ ! -f "${_config_file}.ORIG" ]]; then - echononl " Save installation version of ${_config_file} (Suffix \".ORIF\")" + echononl " Save installation version of ${_config_file} (Suffix \".ORIG\")" cp -a "$_config_file" "${_config_file}.ORIG" > /dev/null 2> $tmp_err_msg if [[ $? -eq 0 ]] ; then echo_ok @@ -1789,6 +1789,10 @@ cat << EOF > /etc/spamassassin/local.cf 2>$tmp_err_msg # ########################################################################### +# A 'contact address' users should contact for more info. (replaces +# _CONTACTADDRESS_ in the report template) +# report_contact youremailaddress@domain.tld + # Add *****SPAM***** to the Subject header of spam e-mails # # rewrite_header Subject *****SPAM***** @@ -1867,6 +1871,28 @@ bayes_ignore_header X-Spam-Flag bayes_ignore_header X-Spam-Status +# Whether to decode non- UTF-8 and non-ASCII textual parts and recode +# them to UTF-8 before the text is given over to rules processing. +# +# normalize_charset 1 + +# Textual body scan limit (default: 50000) +# +# Amount of data per email text/* mimepart, that will be run through body +# rules. This enables safer and faster scanning of large messages, +# perhaps having very large textual attachments. There should be no need +# to change this well tested default. +# +# body_part_scan_size 50000 + +# Textual rawbody data scan limit (default: 500000) +# +# Amount of data per email text/* mimepart, that will be run through +# rawbody rules. +# +# rawbody_part_scan_size 500000 + + # Optional: # Some people believe auto-whitelist is more of a liability than an asset: # @@ -1968,7 +1994,7 @@ fi _config_file=/etc/spamassassin/v310.pre _backup_file="" if [[ ! -f "${_config_file}.ORIG" ]]; then - echononl " Save installation version of ${_config_file} (Suffix \".ORIF\")" + echononl " Save installation version of ${_config_file} (Suffix \".ORIG\")" cp -a "$_config_file" "${_config_file}.ORIG" > /dev/null 2> $tmp_err_msg if [[ $? -eq 0 ]] ; then echo_ok