ISTI-ansible-roles
/
ansible-role-spamassassin
5
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Set the allow_user_rules option explicitly

This commit is contained in:
Andrea Dell'Amico 2020-11-21 15:29:40 +01:00
parent 0184d51b79
commit 5ce3a274af
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -13,6 +13,7 @@ spamassassin_authorized_ip_addresses: '127.0.0.1'
spamassassin_spamd_port: 783 spamassassin_spamd_port: 783
spamassassin_conf_dir: '{{ spamassassin_home }}' spamassassin_conf_dir: '{{ spamassassin_home }}'
spamassassin_sysconfig_file: '/etc/sysconfig/spamassassin' spamassassin_sysconfig_file: '/etc/sysconfig/spamassassin'
spamassassin_allow_user_rules: False
# Only postgresql support for the time being # Only postgresql support for the time being
spamassassin_db_user_config: True spamassassin_db_user_config: True
spamassassin_spamd_sql_opts: '-q -x -u {{ spamassassin_user }} -g {{ spamassassin_group }}' spamassassin_spamd_sql_opts: '-q -x -u {{ spamassassin_user }} -g {{ spamassassin_group }}'

4
templates/spamassassin-db.cf.j2
View File

@ -1,6 +1,10 @@
{% if spamassassin_allow_user_rules %}
{% if spamassassin_db_user_config %}
user_scores_dsn DBI:Pg:dbname={{ spamassassin_db_name }};host={{ spamassassin_db_host }};port={{ spamassassin_db_port }} user_scores_dsn DBI:Pg:dbname={{ spamassassin_db_name }};host={{ spamassassin_db_host }};port={{ spamassassin_db_port }}
user_scores_sql_username {{ spamassassin_db_user }} user_scores_sql_username {{ spamassassin_db_user }}
user_scores_sql_password {{ spamassassin_db_pwd }} user_scores_sql_password {{ spamassassin_db_pwd }}
{% endif %}
{% endif %}
{% if spamassassin_use_bayes and spamassassin_bayes_sql_db %} {% if spamassassin_use_bayes and spamassassin_bayes_sql_db %}
bayes_store_module Mail::SpamAssassin::BayesStore::PgSQL bayes_store_module Mail::SpamAssassin::BayesStore::PgSQL
bayes_sql_dsn DBI:Pg:dbname={{ spamassassin_db_name }};host={{ spamassassin_db_host }};port={{ spamassassin_db_port }} bayes_sql_dsn DBI:Pg:dbname={{ spamassassin_db_name }};host={{ spamassassin_db_host }};port={{ spamassassin_db_port }}

5
templates/spamassassin-local.cf.j2
View File

@ -4,6 +4,11 @@
required_hits {{ spamassassin_required_hits }} required_hits {{ spamassassin_required_hits }}
report_safe {{ spamassassin_report_safe }} report_safe {{ spamassassin_report_safe }}
rewrite_header Subject {{ spamassassin_rewrite_subject }} rewrite_header Subject {{ spamassassin_rewrite_subject }}
{% if spamassassin_allow_user_rules %}
allow_user_rules 1
{% else %}
allow_user_rules 0
{% endif %}
{% if spamassassin_use_bayes %} {% if spamassassin_use_bayes %}
use_bayes 1 use_bayes 1
bayes_auto_learn {{ spamassassin_use_bayes_autolearn }} bayes_auto_learn {{ spamassassin_use_bayes_autolearn }}