Merge remote-tracking branch 'notandy/master'

files/config/mime.types

@@ -5,7 +5,7 @@ types {
     text/xml                              xml;
     image/gif                             gif;
     image/jpeg                            jpeg jpg;
-    application/javascript                js;
+    application/javascript                js mjs;
     application/atom+xml                  atom;
     application/rss+xml                   rss;
 

tasks/main.yml

@@ -5,18 +5,6 @@
     inventory_certs: "{{ certificates.certs|d({}) | dict2items | selectattr ('key', 'regex', '^nginx_') | items2dict }}"
     selfsigned_cert: "{ '{{ inventory_hostname }}': { 'backend': 'selfsigned' }}"
 
-- name: generate certificates for vhosts
-  include_role:
-    name: certificates
-  vars:
-    certificates:
-      certs: "{{ {}|combine( (selfsigned_cert|from_yaml if nginx.snakeoil_default else {}),  nginx_certs, inventory_certs, recursive=True) }}"
-
-- name: debug nginx dict
-  debug:
-    verbosity: 1
-    var: nginx
-
 - name: install nginx
   apt:
     pkg:
@@ -31,6 +19,18 @@
   - delete nginx index.nginx-debian.html
   - restart nginx
 
+- name: generate certificates for vhosts
+  include_role:
+    name: certificates
+  vars:
+    certificates:
+      certs: "{{ {}|combine( (selfsigned_cert|from_yaml if nginx.snakeoil_default else {}),  nginx_certs, inventory_certs, recursive=True) }}"
+
+- name: debug nginx dict
+  debug:
+    verbosity: 1
+    var: nginx
+
 - name: copy configs
   copy:
     src: config/

tasks/php-fpm.yml

@@ -21,13 +21,15 @@
     - php-gmp
     - php-zip
     - php-curl
+    - php-bz2
+    - php-apcu
+    - php-bcmath
+    - php-pear
+    - php-redis
     # database pdos
     - php-pdo-sqlite
     - php-pdo-pgsql
     - php-pdo-mysql
-    - php-apcu
-    - php-bcmath
-    - php-pear
   notify:
   - restart nginx
   - restart php-fpm