diff --git a/defaults/main.yml b/defaults/main.yml index c79a069..f30dee9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,6 +13,7 @@ spamassassin_authorized_ip_addresses: '127.0.0.1' spamassassin_spamd_port: 783 spamassassin_conf_dir: '{{ spamassassin_home }}' spamassassin_sysconfig_file: '/etc/sysconfig/spamassassin' +spamassassin_allow_user_rules: False # Only postgresql support for the time being spamassassin_db_user_config: True spamassassin_spamd_sql_opts: '-q -x -u {{ spamassassin_user }} -g {{ spamassassin_group }}' diff --git a/templates/spamassassin-db.cf.j2 b/templates/spamassassin-db.cf.j2 index 8df3e7f..88acc8f 100644 --- a/templates/spamassassin-db.cf.j2 +++ b/templates/spamassassin-db.cf.j2 @@ -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_sql_username {{ spamassassin_db_user }} user_scores_sql_password {{ spamassassin_db_pwd }} +{% endif %} +{% endif %} {% if spamassassin_use_bayes and spamassassin_bayes_sql_db %} bayes_store_module Mail::SpamAssassin::BayesStore::PgSQL bayes_sql_dsn DBI:Pg:dbname={{ spamassassin_db_name }};host={{ spamassassin_db_host }};port={{ spamassassin_db_port }} diff --git a/templates/spamassassin-local.cf.j2 b/templates/spamassassin-local.cf.j2 index b3f5dd0..076fbec 100644 --- a/templates/spamassassin-local.cf.j2 +++ b/templates/spamassassin-local.cf.j2 @@ -4,6 +4,11 @@ required_hits {{ spamassassin_required_hits }} report_safe {{ spamassassin_report_safe }} 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 %} use_bayes 1 bayes_auto_learn {{ spamassassin_use_bayes_autolearn }}