From 5294d77fa31359cfc6e810cffcc562b369566102 Mon Sep 17 00:00:00 2001
From: Aleksandr Vinokurov <aleksandr.vinokurov@billing.ru>
Date: Fri, 22 Jan 2016 12:26:39 +0300
Subject: [PATCH] Remove new config validation, Fix #41

NOTE: current nginx config validation process breaks SELinux context
for pid file, as described in #41

Restart of nginx is not needed for configuration changes and is
replaced with reload, which will validate config before applying it,
leaving running nginx process untouched in case of any validation
errors.

Restart handler left in support.
---
 handlers/main.yml | 3 +++
 tasks/main.yml    | 4 +---
 tasks/vhosts.yml  | 9 +++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 124c8ba..3f6d024 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -5,3 +5,6 @@
 - name: validate nginx configuration
   command: nginx -t -c /etc/nginx/nginx.conf
   changed_when: False
+
+- name: reload nginx
+  service: name=nginx state=reloaded
diff --git a/tasks/main.yml b/tasks/main.yml
index 4822ec6..116e75e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,10 +26,8 @@
     owner: root
     group: root
     mode: 0644
-    validate: 'nginx -t -c %s'
   notify:
-    - validate nginx configuration
-    - restart nginx
+    - reload nginx
 
 - name: Ensure nginx is started and enabled to start at boot.
   service: name=nginx state=started enabled=yes
diff --git a/tasks/vhosts.yml b/tasks/vhosts.yml
index 5a7bde8..583ff77 100644
--- a/tasks/vhosts.yml
+++ b/tasks/vhosts.yml
@@ -5,8 +5,7 @@
     state: absent
   when: nginx_remove_default_vhost
   notify:
-    - validate nginx configuration
-    - restart nginx
+    - reload nginx
 
 - name: Add managed vhost config file (if any vhosts are configured).
   template:
@@ -15,8 +14,7 @@
     mode: 0644
   when: nginx_vhosts|length > 0
   notify:
-    - validate nginx configuration
-    - restart nginx
+    - reload nginx
 
 - name: Remove managed vhost config file (if no vhosts are configured).
   file:
@@ -24,6 +22,5 @@
     state: absent
   when: nginx_vhosts|length == 0
   notify:
-    - validate nginx configuration
-    - restart nginx
+    - reload nginx