Merge branch 'master' into certbot

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:

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:

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