From 45fbbef950f32040f1f2af4b1ae5d3cfc2498ef2 Mon Sep 17 00:00:00 2001
From: Romain Dessort <rdessort@evolix.fr>
Date: Tue, 23 May 2017 11:37:47 -0400
Subject: [PATCH] Fix issue in Varnish systemd unit

The ExecReload key was not overridden correctly.
---
 varnish/handlers/main.yml         | 3 +++
 varnish/tasks/main.yml            | 1 +
 varnish/templates/varnish.conf.j2 | 1 +
 3 files changed, 5 insertions(+)

diff --git a/varnish/handlers/main.yml b/varnish/handlers/main.yml
index c53989d9..3c61330e 100644
--- a/varnish/handlers/main.yml
+++ b/varnish/handlers/main.yml
@@ -4,3 +4,6 @@
     name: varnish
     state: reloaded
     daemon_reload: yes
+
+- name: reload systemd
+  command: systemctl daemon-reload
diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml
index 672d0c5f..328f458b 100644
--- a/varnish/tasks/main.yml
+++ b/varnish/tasks/main.yml
@@ -40,6 +40,7 @@
     dest: /etc/systemd/system/varnish.service.d/varnish.conf
     force: yes
     backup: yes
+  notify: reload systemd
   tags:
   - varnish
 
diff --git a/varnish/templates/varnish.conf.j2 b/varnish/templates/varnish.conf.j2
index ccba3ebb..a60462e2 100644
--- a/varnish/templates/varnish.conf.j2
+++ b/varnish/templates/varnish.conf.j2
@@ -3,4 +3,5 @@
 [Service]
 ExecStart=
 ExecStart=/usr/sbin/varnishd -a {{ varnish_addresses | join(',') }} -T {{ varnish_management_address }} -f {{ varnish_config_file }} -S {{ varnish_secret_file }} -s {{ varnish_storage }} -p thread_pools={{ varnish_thread_pools }} -p thread_pool_add_delay={{ varnish_thread_pool_add_delay }} -p thread_pool_min={{ varnish_thread_pool_min }} -p thread_pool_max={{ varnish_thread_pool_max }}
+ExecReload=
 ExecReload=/etc/varnish/reload-vcl.sh