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

Assign the perl packages to the right plugin

This commit is contained in:
Andrea Dell'Amico 2020-09-23 18:55:43 +02:00
parent 6a7c9ebd0b
commit e627ce4bd2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
defaults/main.yml
View File

@ -130,6 +130,11 @@ spamassassin_clamav_github_plugin_url: 'https://raw.githubusercontent.com/bigio/
spamassassin_ole2macro_github_plugin: True spamassassin_ole2macro_github_plugin: True
spamassassin_ole2macro_github_plugin_url: 'https://raw.githubusercontent.com/bigio/spamassassin-vba-macro/master/ole2macro.pm' spamassassin_ole2macro_github_plugin_url: 'https://raw.githubusercontent.com/bigio/spamassassin-vba-macro/master/ole2macro.pm'
spamassassin_ole2macro_github_plugin_score: '3' spamassassin_ole2macro_github_plugin_score: '3'
spamassassin_ole2_perl_packages:
- 'perl-IO-Compress'
- 'perl-IO-Compress-Lzma'
- 'perl-MIME-tools'
- 'perl-OLE-Storage_Lite'
# https://github.com/bigio/spamassassin-dmarc # https://github.com/bigio/spamassassin-dmarc
spamassassin_dmarc_github_plugin: True spamassassin_dmarc_github_plugin: True
@ -140,12 +145,6 @@ spamassassin_dmarc_github_dmarc_none_score: '0.1'
spamassassin_dmarc_github_dmarc_missing_score: '0.0' spamassassin_dmarc_github_dmarc_missing_score: '0.0'
spamassassin_dmarc_github_dmarc_pass_score: '-0.1' spamassassin_dmarc_github_dmarc_pass_score: '-0.1'
spamassassin_dmarc_perl_packages:
- 'perl-IO-Compress'
- 'perl-IO-Compress-Lzma'
- 'perl-MIME-tools'
- 'perl-OLE-Storage_Lite'
psql_db_data: psql_db_data:
- { name: '{{ spamassassin_db_name }}', encoding: 'UTF8', user: '{{ spamassassin_db_user }}', roles: 'NOCREATEDB,NOSUPERUSER', pwd: '{{ spamassassin_db_pwd }}', managedb: True, allowed_hosts: '{{ spamassassin_db_allowed_hosts }}', extensions: [ '' ], schema_file: '/srv/spamassassin.sql' } - { name: '{{ spamassassin_db_name }}', encoding: 'UTF8', user: '{{ spamassassin_db_user }}', roles: 'NOCREATEDB,NOSUPERUSER', pwd: '{{ spamassassin_db_pwd }}', managedb: True, allowed_hosts: '{{ spamassassin_db_allowed_hosts }}', extensions: [ '' ], schema_file: '/srv/spamassassin.sql' }

2
tasks/spamassassin.yml
View File

@ -97,7 +97,7 @@
notify: Restart spamassassin notify: Restart spamassassin
- name: spamassassin packages, RH/CentOS - name: spamassassin packages, RH/CentOS
yum: pkg={{ spamassassin_dmarc_perl_packages }} state=present yum: pkg={{ spamassassin_ole2_perl_packages }} state=present
when: ansible_distribution_file_variety == "RedHat" when: ansible_distribution_file_variety == "RedHat"