From 9a436fd089b5b2d5c0a196fa7fd60bcb61046e4a Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 11 Jan 2020 19:00:39 -0500 Subject: [PATCH] Clean nginx/tasks/install.yml --- roles/nginx/tasks/install.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 7271ed86e..e3198509f 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -1,5 +1,7 @@ -- name: Install nginx required and helper packages - package: name={{ item }} state=present +- name: Install NGINX required and helper packages + package: + name: "{{ item }}" + state: present with_items: - nginx-extras - uwsgi @@ -12,24 +14,23 @@ name: "{{ apache_user }}" groups: shadow -- name: Remove the nginx default config +- name: Remove NGINX default config /etc/nginx/sites-enabled/default file: path: /etc/nginx/sites-enabled/default state: absent -- name: Put config files in place (2 into /etc/nginx, 1 into /etc/{{ apache_service }}) +- name: 'Install 4 files from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/{{ apache_service }}/ports.conf, /etc/systemd/system/uwsgi.service' template: - src: '{{ item.src}}' - dest: '{{ item.dest }}' + src: "{{ item.src }}" + dest: "{{ item.dest }}" with_items: - - { src: "roles/nginx/templates/server.conf", dest: "/etc/nginx/" } - - { src: "roles/nginx/templates/nginx.conf", dest: "/etc/nginx/" } - - { src: 'roles/nginx/templates/ports.conf', dest: '/etc/{{ apache_service }}/' , mode: '0644' } - - { src: 'roles/nginx/templates/uwsgi.service', dest: '/etc/systemd/system/' , mode: '0644' } + - { src: 'roles/nginx/templates/server.conf', dest: '/etc/nginx/' } + - { src: 'roles/nginx/templates/nginx.conf', dest: '/etc/nginx/' } + - { src: 'roles/nginx/templates/ports.conf', dest: '/etc/{{ apache_service }}/' } + - { src: 'roles/nginx/templates/uwsgi.service', dest: '/etc/systemd/system/' } -- name: Let uwsgi running as {{ apache_user }} write log files +- name: Let uwsgi (running as {{ apache_user }}) write log files file: - path: /var/log/uwsgi/app - state: directory - owner: "{{ apache_user }}" - + path: /var/log/uwsgi/app + state: directory + owner: "{{ apache_user }}"