From 139a27383d43ab6111ab03ffb8c43d0d6a4431c6 Mon Sep 17 00:00:00 2001
From: Gregory Colpart <gcolpart+git@evolix.fr>
Date: Thu, 14 Sep 2017 19:30:59 +0200
Subject: [PATCH] Use /etc/systemd/system/*.service.d/evolinux.conf and fix
 systemd unit

---
 varnish/tasks/main.yml            | 4 ++--
 varnish/templates/varnish.conf.j2 | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml
index 798f7aec..ffd80889 100644
--- a/varnish/tasks/main.yml
+++ b/varnish/tasks/main.yml
@@ -34,10 +34,10 @@
   tags:
   - varnish
 
-- name: Modify Varnish configuration files
+- name: Override Varnish systemd unit
   template:
     src: varnish.conf.j2
-    dest: /etc/systemd/system/varnish.service.d/varnish.conf
+    dest: /etc/systemd/system/varnish.service.d/evolinux.conf
     force: yes
   notify: reload systemd
   tags:
diff --git a/varnish/templates/varnish.conf.j2 b/varnish/templates/varnish.conf.j2
index a60462e2..275e8909 100644
--- a/varnish/templates/varnish.conf.j2
+++ b/varnish/templates/varnish.conf.j2
@@ -1,7 +1,5 @@
 # {{ ansible_managed }}
 
 [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