diff --git a/files/config/mime.types b/files/config/mime.types index 89be9a4cd636241f8fb4b06942f106bd3b9fff16..176b6c5fc6ceaf854b981612d6bee19ffe23e328 100644 --- a/files/config/mime.types +++ b/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; diff --git a/tasks/main.yml b/tasks/main.yml index 043be4c2ec1dbae1eb03cc203864e696ae6f3df3..0c06b230ae4b311ef9db3c1d1b77dff3026c9d6b 100644 --- a/tasks/main.yml +++ b/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/ diff --git a/tasks/php-fpm.yml b/tasks/php-fpm.yml index 9e066552f9910c0815c35ecc7e3d06e7908a6e02..b8b2d83efddca5d4b9ae8c9b7711613cdcbfdcc6 100644 --- a/tasks/php-fpm.yml +++ b/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