From e627ce4bd2dc035c2113516ba63281df2b0a4a14 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 23 Sep 2020 18:55:43 +0200 Subject: [PATCH] Assign the perl packages to the right plugin --- defaults/main.yml | 11 +++++------ tasks/spamassassin.yml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 802ec4b..3d3fdf2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -130,6 +130,11 @@ spamassassin_clamav_github_plugin_url: 'https://raw.githubusercontent.com/bigio/ 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_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 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_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: - { 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' } diff --git a/tasks/spamassassin.yml b/tasks/spamassassin.yml index 4ce4d20..26b1454 100644 --- a/tasks/spamassassin.yml +++ b/tasks/spamassassin.yml @@ -97,7 +97,7 @@ notify: Restart spamassassin - 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"