Skip to content

Commit

Permalink
Re-order template deploy & add validate:
Browse files Browse the repository at this point in the history
Re-ordering the tasks in this way (having the vhosts deployed first)
allows the 'validate' param to collectively check the deployed Nginx config.

Deploying vhosts after makes it hard to check their validity, as Nginx's
config checking will operate on a "master" configuration that includes
others (checking those included, also) but would error out when checking
these individual configs if they do not contain a fully working Nginx
config (which they often don't, due to their nature).
  • Loading branch information
cmacrae committed Dec 22, 2015
1 parent 1f99c72 commit cc5114d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
- include: setup-Debian.yml
when: ansible_os_family == 'Debian'

# Vhost configuration
- include: vhosts.yml

# Nginx setup.
- name: Copy nginx configuration in place.
template:
Expand All @@ -23,9 +26,8 @@
owner: root
group: root
mode: 0644
validate: 'nginx -t -c %s'
notify: restart nginx

- name: Ensure nginx is started and enabled to start at boot.
service: name=nginx state=started enabled=yes

- include: vhosts.yml

0 comments on commit cc5114d

Please sign in to comment.