From 8861169a04206c29729d50f9c85b9bd8e81b0b6c Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sun, 20 Dec 2020 22:55:39 +0100
Subject: [PATCH] varnish: config file name is configurable

---
 CHANGELOG.md                       | 1 +
 varnish/files/reload-vcl.sh        | 5 -----
 varnish/tasks/main.yml             | 6 +++---
 varnish/templates/reload-vcl.sh.j2 | 5 +++++
 4 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 varnish/files/reload-vcl.sh
 create mode 100644 varnish/templates/reload-vcl.sh.j2

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec95a820..79fa9859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ The **patch** part changes incrementally at each release.
 * redis: variable to force use of port 6379 in instances mode
 * redis: check maxmemory in NRPE check
 * lxc-php: Allow php containers to contact local MySQL with localhost
+* varnish: config file name is configurable
 
 ### Changed
 
diff --git a/varnish/files/reload-vcl.sh b/varnish/files/reload-vcl.sh
deleted file mode 100644
index 537dcddf..00000000
--- a/varnish/files/reload-vcl.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-UUID=`cat /proc/sys/kernel/random/uuid`
-/usr/sbin/varnishd -C -f /etc/varnish/default.vcl >/dev/null \
- &&/usr/bin/varnishadm -T localhost:6082 -S /etc/varnish/secret "vcl.load vcl_$UUID /etc/varnish/default.vcl" \
- && /usr/bin/varnishadm -T localhost:6082 -S /etc/varnish/secret "vcl.use vcl_$UUID"
diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml
index c55218ef..1bf61fde 100644
--- a/varnish/tasks/main.yml
+++ b/varnish/tasks/main.yml
@@ -19,8 +19,8 @@
   - varnish
 
 - name: Copy Custom Varnish ExecReload script (Debian <=9)
-  copy:
-    src: "reload-vcl.sh"
+  template:
+    src: "reload-vcl.sh.j2"
     dest: "/etc/varnish/reload-vcl.sh"
     mode: "0700"
     owner: root
@@ -62,7 +62,7 @@
 - name: Copy Varnish configuration
   template:
     src: "{{ item }}"
-    dest: /etc/varnish/default.vcl
+    dest: "{{ varnish_config_file }}"
     mode: "0644"
     force: yes
   with_first_found:
diff --git a/varnish/templates/reload-vcl.sh.j2 b/varnish/templates/reload-vcl.sh.j2
new file mode 100644
index 00000000..e60d8257
--- /dev/null
+++ b/varnish/templates/reload-vcl.sh.j2
@@ -0,0 +1,5 @@
+#!/bin/sh
+UUID=`cat /proc/sys/kernel/random/uuid`
+/usr/sbin/varnishd -C -f {{ varnish_config_file }} >/dev/null \
+  && /usr/bin/varnishadm -T {{ varnish_management_address }} -S {{ varnish_secret_file }} "vcl.load vcl_$UUID {{ varnish_config_file }}" \
+  && /usr/bin/varnishadm -T {{ varnish_management_address }} -S {{ varnish_secret_file }} "vcl.use vcl_$UUID"