Upgrade syntax to Ansible 2.7 (apt module).

3 files changed, 9 insertions, 6 deletions

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,23 +1,24 @@
 - name: Install Postfix
-  apt: pkg={{ item }}
-  with_items:
+  apt: pkg={{ packages }}
+  vars:
+    packages:
     - postfix
     - postfix-ldap
 
 - name: Configure Postfix
   template: src=etc/postfix/{{ item }}.j2
             dest=/etc/postfix-{{ postfix_instance[inst].name }}/{{ item }}
             owner=root group=root
             mode=0644
   with_items:
     - main.cf
     - master.cf
   notify:
     - Reload Postfix
 
 - name: Copy the transport maps
   copy: src=etc/postfix/transport
         dest=/etc/postfix-{{ postfix_instance[inst].name }}/transport
         owner=root group=root
         mode=0644
   # no need to reload upon change, as cleanup(8) is short-running
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,23 +1,24 @@
 - name: Install MLMMJ
-  apt: pkg={{ item }}
-  with_items:
+  apt: pkg={{ packages }}
+  vars:
+    packages:
     - mlmmj
 
 # Weird the debian package doesn't do it by itself...
 - name: Create a user 'mlmmj'
   user: name=mlmmj system=yes
         createhome=no
         home=/var/spool/mlmmj
         shell=/usr/sbin/nologin
         password=!
         state=present
 
 - name: Add 'www-data' to the group 'mlmmj'
   user: name=www-data groups=mlmmj append=yes
 
 - name: Create a home directory for user 'mlmmj'
   file: path=/var/spool/mlmmj
         state=directory
         owner=mlmmj group=mlmmj
         mode=0700
 
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,22 +1,23 @@
-- apt: pkg={{ item }} install_recommends=no
-  with_items:
+- apt: pkg={{ packages }} install_recommends=no
+  vars:
+    packages:
     - mariadb-server
     - sympa
     - libnet-dns-perl
     - libnet-dns-sec-perl
     - libmail-dkim-perl
     - libcrypt-smime-perl
     - libcrypt-openssl-x509-perl
 
 - name: Make the 'sympa' MySQL user use unix_socket
   mysql_user2: name=sympa password= auth_plugin=unix_socket
                state=present
 
 # XXX We want to change the retun-path for sendpasswd notices from
 # 'sympa-request@$robot' to 'noreply@fripost.org'.
 #   * /usr/lib/cgi-bin/sympa/wwsympa.fcgi
 #       do_requestpasswd, do_subrequest
 #         add $param->{'return_path'}='noreply@fripost.org';
 #   * /usr/share/sympa/lib/List.pm
 #       send_global_file
 #         $data->{'return_path'} //= &Conf::get_robot_conf($robot, 'request');