From cfedc9e785831d54195b120300932f74f9808daf Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Mon, 3 Dec 2018 03:21:42 +0100 Subject: Upgrade syntax to Ansible 2.7 (apt module). --- roles/IMAP/tasks/imap.yml | 5 +++-- roles/IMAP/tasks/mda.yml | 5 +++-- roles/IMAP/tasks/spam.yml | 5 +++-- roles/MSA/tasks/main.yml | 5 +++-- roles/MX/tasks/main.yml | 5 +++-- roles/amavis/tasks/main.yml | 5 +++-- roles/bacula-dir/tasks/main.yml | 5 +++-- roles/common-LDAP/tasks/main.yml | 5 +++-- roles/common-SQL/tasks/main.yml | 5 +++-- roles/common/tasks/apt.yml | 5 +++-- roles/common/tasks/clamav.yml | 5 +++-- roles/common/tasks/firewall.yml | 5 +++-- roles/common/tasks/ipsec.yml | 5 +++-- roles/common/tasks/logging.yml | 5 +++-- roles/common/tasks/mail.yml | 5 +++-- roles/common/tasks/main.yml | 5 +++-- roles/common/tasks/munin-node.yml | 5 +++-- roles/common/tasks/rkhunter.yml | 5 +++-- roles/git/tasks/cgit.yml | 5 +++-- roles/lists/tasks/mail.yml | 5 +++-- roles/lists/tasks/mlmmj.yml | 5 +++-- roles/lists/tasks/sympa.yml | 5 +++-- roles/munin-master/tasks/main.yml | 5 +++-- roles/webmail/tasks/roundcube.yml | 15 +++++++++------ roles/wiki/tasks/main.yml | 5 +++-- 25 files changed, 81 insertions(+), 54 deletions(-) (limited to 'roles') diff --git a/roles/IMAP/tasks/imap.yml b/roles/IMAP/tasks/imap.yml index 75b250d..18aa910 100644 --- a/roles/IMAP/tasks/imap.yml +++ b/roles/IMAP/tasks/imap.yml @@ -1,6 +1,7 @@ - name: Install Dovecot - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - dovecot-core - dovecot-ldap - dovecot-imapd diff --git a/roles/IMAP/tasks/mda.yml b/roles/IMAP/tasks/mda.yml index 1510103..f705fe7 100644 --- a/roles/IMAP/tasks/mda.yml +++ b/roles/IMAP/tasks/mda.yml @@ -1,6 +1,7 @@ - name: Install Postfix - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - postfix - postfix-ldap diff --git a/roles/IMAP/tasks/spam.yml b/roles/IMAP/tasks/spam.yml index 3091b85..c275b55 100644 --- a/roles/IMAP/tasks/spam.yml +++ b/roles/IMAP/tasks/spam.yml @@ -1,6 +1,7 @@ - name: Install spamassassin - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: # The following two lines are for the policy lookup (made by amavis) - libnet-ldap-perl - libauthen-sasl-perl diff --git a/roles/MSA/tasks/main.yml b/roles/MSA/tasks/main.yml index 4f32df3..65d1dae 100644 --- a/roles/MSA/tasks/main.yml +++ b/roles/MSA/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install Postfix - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - postfix - postfix-pcre diff --git a/roles/MX/tasks/main.yml b/roles/MX/tasks/main.yml index 6092301..507a4f2 100644 --- a/roles/MX/tasks/main.yml +++ b/roles/MX/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install Postfix - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - postfix - postfix-pcre - postfix-ldap diff --git a/roles/amavis/tasks/main.yml b/roles/amavis/tasks/main.yml index ce43c9c..936703a 100644 --- a/roles/amavis/tasks/main.yml +++ b/roles/amavis/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install amavis and its decoders - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - amavisd-new - libnet-ldap-perl # Mail::DKIM diff --git a/roles/bacula-dir/tasks/main.yml b/roles/bacula-dir/tasks/main.yml index 4cacc6e..723aa22 100644 --- a/roles/bacula-dir/tasks/main.yml +++ b/roles/bacula-dir/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install bacula-director - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - bacula-console - bacula-director-mysql diff --git a/roles/common-LDAP/tasks/main.yml b/roles/common-LDAP/tasks/main.yml index 22265cd..5255cdf 100644 --- a/roles/common-LDAP/tasks/main.yml +++ b/roles/common-LDAP/tasks/main.yml @@ -1,8 +1,9 @@ # XXX If #742056 gets fixed, we should preseed slapd to use peercreds as # RootDN once the fix enters stable. - name: Install OpenLDAP - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - slapd - ldap-utils - ldapvi diff --git a/roles/common-SQL/tasks/main.yml b/roles/common-SQL/tasks/main.yml index 73b6878..d6ab1c4 100644 --- a/roles/common-SQL/tasks/main.yml +++ b/roles/common-SQL/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install MariaDB - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - mariadb-common - mariadb-server - python-mysqldb diff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml index 2f5a62a..8df3e8f 100644 --- a/roles/common/tasks/apt.yml +++ b/roles/common/tasks/apt.yml @@ -1,6 +1,7 @@ - name: Install various APT tools - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - apt - apt-listchanges - apt-show-versions diff --git a/roles/common/tasks/clamav.yml b/roles/common/tasks/clamav.yml index 28a8460..437387b 100644 --- a/roles/common/tasks/clamav.yml +++ b/roles/common/tasks/clamav.yml @@ -1,6 +1,7 @@ - name: Install ClamAV - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - clamav - clamav-daemon - clamav-freshclam diff --git a/roles/common/tasks/firewall.yml b/roles/common/tasks/firewall.yml index d418326..133b631 100644 --- a/roles/common/tasks/firewall.yml +++ b/roles/common/tasks/firewall.yml @@ -1,6 +1,7 @@ - name: Install some packages required for the firewall - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - iptables - netmask - bsdutils diff --git a/roles/common/tasks/ipsec.yml b/roles/common/tasks/ipsec.yml index ce158fe..989541b 100644 --- a/roles/common/tasks/ipsec.yml +++ b/roles/common/tasks/ipsec.yml @@ -1,6 +1,7 @@ - name: Install strongSwan - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - strongswan-charon # for the GCM and openssl plugins - libstrongswan-standard-plugins diff --git a/roles/common/tasks/logging.yml b/roles/common/tasks/logging.yml index b27fc41..b602a49 100644 --- a/roles/common/tasks/logging.yml +++ b/roles/common/tasks/logging.yml @@ -1,6 +1,7 @@ - name: Install logging server & utilities - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - rsyslog - syslog-summary - logcheck diff --git a/roles/common/tasks/mail.yml b/roles/common/tasks/mail.yml index 49815f5..139386f 100644 --- a/roles/common/tasks/mail.yml +++ b/roles/common/tasks/mail.yml @@ -1,6 +1,7 @@ - name: Install Postfix - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: # That one is nicer than GNU mailutils' mailx(1) - s-nail - postfix diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index c978e91..7795da8 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -69,8 +69,9 @@ - munin - name: Install common packages - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - ca-certificates - etckeeper - ethtool diff --git a/roles/common/tasks/munin-node.yml b/roles/common/tasks/munin-node.yml index d4f8d95..f43094a 100644 --- a/roles/common/tasks/munin-node.yml +++ b/roles/common/tasks/munin-node.yml @@ -1,6 +1,7 @@ - name: Install munin-node - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - munin-node - munin-plugins-extra ### diff --git a/roles/common/tasks/rkhunter.yml b/roles/common/tasks/rkhunter.yml index c9d26fa..64f2aac 100644 --- a/roles/common/tasks/rkhunter.yml +++ b/roles/common/tasks/rkhunter.yml @@ -1,6 +1,7 @@ - name: Install rkhunter - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - rkhunter - curl - iproute2 diff --git a/roles/git/tasks/cgit.yml b/roles/git/tasks/cgit.yml index 1dd2cd6..160ede6 100644 --- a/roles/git/tasks/cgit.yml +++ b/roles/git/tasks/cgit.yml @@ -1,6 +1,7 @@ - name: Install cgit - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - cgit - highlight - uwsgi diff --git a/roles/lists/tasks/mail.yml b/roles/lists/tasks/mail.yml index 8705f91..44b96e5 100644 --- a/roles/lists/tasks/mail.yml +++ b/roles/lists/tasks/mail.yml @@ -1,6 +1,7 @@ - name: Install Postfix - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - postfix - postfix-ldap diff --git a/roles/lists/tasks/mlmmj.yml b/roles/lists/tasks/mlmmj.yml index 45fc8f4..aeaaedc 100644 --- a/roles/lists/tasks/mlmmj.yml +++ b/roles/lists/tasks/mlmmj.yml @@ -1,6 +1,7 @@ - name: Install MLMMJ - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - mlmmj # Weird the debian package doesn't do it by itself... diff --git a/roles/lists/tasks/sympa.yml b/roles/lists/tasks/sympa.yml index 3b4ac9f..284f320 100644 --- a/roles/lists/tasks/sympa.yml +++ b/roles/lists/tasks/sympa.yml @@ -1,5 +1,6 @@ -- apt: pkg={{ item }} install_recommends=no - with_items: +- apt: pkg={{ packages }} install_recommends=no + vars: + packages: - mariadb-server - sympa - libnet-dns-perl diff --git a/roles/munin-master/tasks/main.yml b/roles/munin-master/tasks/main.yml index 8c7a6a6..9ed3577 100644 --- a/roles/munin-master/tasks/main.yml +++ b/roles/munin-master/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install munin - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - munin - rrdcached - libcgi-fast-perl diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml index 5f41ba0..699815a 100644 --- a/roles/webmail/tasks/roundcube.yml +++ b/roles/webmail/tasks/roundcube.yml @@ -1,6 +1,7 @@ - name: Install PHP - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - php5-fpm - php5-ldap - php5-gd @@ -34,8 +35,9 @@ - Restart php5 - name: Install GNU Aspell and some dictionaries - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - aspell - aspell-da - aspell-de @@ -46,8 +48,9 @@ - aspell-sv - name: Install Roundcube - apt: pkg={{ item }} default_release={{ ansible_lsb.codename }}-backports - with_items: + apt: pkg={{ packages }} default_release={{ ansible_lsb.codename }}-backports + vars: + packages: - roundcube-core - roundcube-mysql - roundcube-plugins diff --git a/roles/wiki/tasks/main.yml b/roles/wiki/tasks/main.yml index 3cd3e51..718b433 100644 --- a/roles/wiki/tasks/main.yml +++ b/roles/wiki/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install ikiwiki - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - ikiwiki - libauthen-passphrase-perl - highlight-common -- cgit v1.2.3