From cc5114dc4f520b89619934d1dd04ea13fef45c1b Mon Sep 17 00:00:00 2001 From: cmacrae Date: Tue, 22 Dec 2015 15:37:58 +0000 Subject: [PATCH] Re-order template deploy & add validate: 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). --- tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index d63dbac..582875e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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: @@ -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