Merge pull request 'More configurable options for the spamassassin plugin.' (#184) from adellam/ansible-roles:master into master
This commit is contained in:
commit
f7ac144d55
|
@ -140,11 +140,16 @@ roundcube_sauserprefs_pyzor_enabled: '0'
|
|||
roundcube_sauserprefs_bayes_enabled: False
|
||||
roundcube_sauserprefs_bayes_rules: '0'
|
||||
roundcube_sauserprefs_bayes_autolearn: '0'
|
||||
roundcube_sauserprefs_bayes_autolearn_threshold_nospam: '0.1'
|
||||
roundcube_sauserprefs_bayes_autolearn_threshold_spam: '12.0'
|
||||
roundcube_sauserprefs_autowhitelist_enabled: False
|
||||
roundcube_sauserprefs_subject: '[SPAM]'
|
||||
roundcube_sauserprefs_report_safe: '0'
|
||||
roundcube_sauserprefs_skip_rbl_checks: '0'
|
||||
# Sections are: general,tests,bayes,headers,report,addresses
|
||||
roundcube_sauserprefs_do_not_override_array: "'use_razor1','use_razor2','use_dcc'"
|
||||
roundcube_sauserprefs_score_opts_min: 1
|
||||
roundcube_sauserprefs_score_opts_max: 10
|
||||
|
||||
roundcube_managesieve_config: True
|
||||
roundcube_managesieve_auth: 'plain'
|
||||
|
|
|
@ -86,8 +86,8 @@ $config['sauserprefs_default_prefs'] = array(
|
|||
{% if roundcube_sauserprefs_bayes_enabled %}
|
||||
'use_bayes' => 1,
|
||||
'bayes_auto_learn' => {{ roundcube_sauserprefs_bayes_autolearn }},
|
||||
'bayes_auto_learn_threshold_nonspam' => 0.1,
|
||||
'bayes_auto_learn_threshold_spam' => 12.0,
|
||||
'bayes_auto_learn_threshold_nonspam' => {{ roundcube_sauserprefs_bayes_autolearn_threshold_nospam }},
|
||||
'bayes_auto_learn_threshold_spam' => {{ roundcube_sauserprefs_bayes_autolearn_threshold_spam }},
|
||||
'use_bayes_rules' => {{ roundcube_sauserprefs_bayes_rules }},
|
||||
{% endif %}
|
||||
{% if roundcube_sauserprefs_autowhitelist_enabled %}
|
||||
|
@ -105,7 +105,7 @@ $config['sauserprefs_default_prefs'] = array(
|
|||
// '[field name]' => array('min' => [min], 'max' => [max], 'increment' => [increment], 'extra' => array())
|
||||
// note: the 'extra' key is optional and should contain further arrays with min, max and increment keys
|
||||
$config['sauserprefs_score_options'] = array(
|
||||
'*' => array('min' => 1, 'max' => 10, 'increment' => 1),
|
||||
'*' => array('min' => {{ roundcube_sauserprefs_score_opts_min }}, 'max' => {{ roundcube_sauserprefs_score_opts_max }}, 'increment' => 1),
|
||||
'_bayesnonspam' => array('min' => -1, 'max' => 1, 'increment' => 0.1),
|
||||
'_bayesspam' => array('min' => 1, 'max' => 20, 'increment' => 1),
|
||||
'_score_user_blacklist' => array('min' => 0, 'max' => 100, 'increment' => 10, 'extra' => array(array('min' => 1, 'max' => 10, 'increment' => 1))),
|
||||
|
|
Loading…
Reference in New Issue