From 61ebb43922e9d7513bb67c1391d16f663bf756c9 Mon Sep 17 00:00:00 2001
From: eric <eric@hellman.net>
Date: Thu, 24 Jan 2019 13:22:04 -0500
Subject: [PATCH 1/2] apt with squash_items is deprecated

---
 roles/regluit_prod/tasks/apache.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/roles/regluit_prod/tasks/apache.yml b/roles/regluit_prod/tasks/apache.yml
index 7216832..37aaa5d 100644
--- a/roles/regluit_prod/tasks/apache.yml
+++ b/roles/regluit_prod/tasks/apache.yml
@@ -2,12 +2,8 @@
 - name: Install apache
   become: yes
   apt:
-    name: "{{ item }}"
+    name: ['apache2', 'libapache2-mod-wsgi', 'cronolog']
     state: present
-  with_items:
-    - 'apache2'
-    - 'libapache2-mod-wsgi'
-    - 'cronolog'
 
 - name: Ensure apache is running and enabled
   become: yes

From 5285108d111cc3ffb0721a6fffbd844e8fc2f562 Mon Sep 17 00:00:00 2001
From: eric <eric@hellman.net>
Date: Thu, 24 Jan 2019 17:06:33 -0500
Subject: [PATCH 2/2] more deprecations

---
 roles/regluit_common/tasks/main.yml | 16 +---------------
 roles/regluit_dev/tasks/main.yml    | 16 +---------------
 roles/regluit_prod/tasks/main.yml   | 19 +------------------
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/roles/regluit_common/tasks/main.yml b/roles/regluit_common/tasks/main.yml
index d753064..38adc2a 100644
--- a/roles/regluit_common/tasks/main.yml
+++ b/roles/regluit_common/tasks/main.yml
@@ -13,23 +13,9 @@
 - name: Install base regluit dependencies
   become: true
   apt:
-    name: "{{ item }}"
+    name: ['git', 'python-setuptools', 'python-lxml', 'build-essential', 'libssl-dev', 'libffi-dev', 'libxml2-dev', 'libxslt-dev', 'mysql-server', 'mysql-client', 'libmysqlclient-dev', 'python-mysqldb', 'libcairo2']
     update_cache: true
     state: present
-  with_items:
-    - 'git'
-    - 'python-setuptools'
-    - 'python-lxml'
-    - 'build-essential'
-    - 'libssl-dev'
-    - 'libffi-dev'
-    - 'libxml2-dev'
-    - 'libxslt-dev'
-    - 'mysql-server'
-    - 'mysql-client'
-    - 'libmysqlclient-dev'
-    - 'python-mysqldb'
-    - 'libcairo2'
 
 - name: Install virtualenv
   pip:
diff --git a/roles/regluit_dev/tasks/main.yml b/roles/regluit_dev/tasks/main.yml
index 9f7ec6a..c39323e 100644
--- a/roles/regluit_dev/tasks/main.yml
+++ b/roles/regluit_dev/tasks/main.yml
@@ -3,23 +3,9 @@
 - name: Install dev dependencies
   become: true
   apt:
-    name: "{{ item }}"
+    name: ['git', 'python-setuptools', 'python-lxml', 'build-essential', 'libssl-dev', 'libffi-dev', 'libxml2-dev', 'libxslt-dev', 'mysql-server', 'mysql-client', 'libmysqlclient-dev', 'python-mysqldb', 'libcairo2']
     update_cache: true
     state: present
-  with_items:
-    - 'git'
-    - 'python-setuptools'
-    - 'python-lxml'
-    - 'build-essential'
-    - 'libssl-dev'
-    - 'libffi-dev'
-    - 'libxml2-dev'
-    - 'libxslt-dev'
-    - 'mysql-server'
-    - 'mysql-client'
-    - 'libmysqlclient-dev'
-    - 'python-mysqldb'
-    - 'libcairo2'
 
 - name: Migrate database
   django_manage:
diff --git a/roles/regluit_prod/tasks/main.yml b/roles/regluit_prod/tasks/main.yml
index 97f6c13..663937d 100644
--- a/roles/regluit_prod/tasks/main.yml
+++ b/roles/regluit_prod/tasks/main.yml
@@ -2,26 +2,9 @@
 - name: Install prod dependencies
   become: true
   apt:
-    name: "{{ item }}"
+    name: ['git', 'python-setuptools', 'python-lxml', 'python-dev', 'python-virtualenv', 'build-essential', 'libssl-dev', 'libffi-dev', 'libxml2-dev', 'libxslt-dev', 'mysql-client', 'libmysqlclient-dev', 'python-mysqldb', 'libcairo2', 'postfix', 'libjpeg-dev']
     update_cache: true
     state: present
-  with_items:
-    - 'git'
-    - 'python-setuptools'
-    - 'python-lxml'
-    - 'python-dev'
-    - 'python-virtualenv'
-    - 'build-essential'
-    - 'libssl-dev'
-    - 'libffi-dev'
-    - 'libxml2-dev'
-    - 'libxslt-dev'
-    - 'mysql-client'
-    - 'libmysqlclient-dev'
-    - 'python-mysqldb'
-    - 'libcairo2'
-    - 'postfix'
-    - 'libjpeg-dev'
 
 - name: Create project directory
   become: true