From 45337ece51bab3b09ed34653ef0226f712bca454 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 12 Apr 2017 18:04:36 +0200
Subject: [PATCH] Varnish: add many variables for systemd unit file

---
 varnish/defaults/main.yml         | 19 +++++++++++++++++--
 varnish/files/varnish.conf        |  4 ----
 varnish/tasks/main.yml            |  8 +++++---
 varnish/templates/varnish.conf.j2 |  5 +++++
 4 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 varnish/files/varnish.conf
 create mode 100644 varnish/templates/varnish.conf.j2

diff --git a/varnish/defaults/main.yml b/varnish/defaults/main.yml
index 8670c1d2..0cd95b41 100644
--- a/varnish/defaults/main.yml
+++ b/varnish/defaults/main.yml
@@ -1,3 +1,18 @@
 ---
-thread_pools: "{{ ansible_processor_cores * ansible_processor_count }}"
-malloc: "2G"
+
+varnish_addresses:
+- 0.0.0.0:80
+
+varnish_management_address: localhost:6082
+
+varnish_malloc_size: "2G"
+
+varnish_storage: malloc,{{ varnish_malloc_size }}
+
+varnish_thread_pools: "{{ ansible_processor_cores * ansible_processor_count }}"
+varnish_thread_pool_add_delay: 2
+varnish_thread_pool_min: 500
+varnish_thread_pool_max: 5000
+
+varnish_config_file: /etc/varnish/default.vcl
+varnish_secret_file: /etc/varnish/secret
diff --git a/varnish/files/varnish.conf b/varnish/files/varnish.conf
deleted file mode 100644
index d1f113c2..00000000
--- a/varnish/files/varnish.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -T localhost:6082 -f /etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,2G -p thread_pools=2 -p thread_pool_add_delay=2 -p thread_pool_min=500 -p thread_pool_max=5000 
-ExecReload=/etc/varnish/reload-vcl.sh
diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml
index 5815ec47..0f94b1e8 100644
--- a/varnish/tasks/main.yml
+++ b/varnish/tasks/main.yml
@@ -24,9 +24,11 @@
     state: directory
 
 - name: Modify Varnish configuration files
-  copy:
-    src: varnish.conf
-    dest: /etc/systemd/system/varnish.service.d/
+  template:
+    src: varnish.conf.j2
+    dest: /etc/systemd/system/varnish.service.d/varnish.conf
+    force: yes
+    backup: yes
   notify: reload systemctl
 
 - name: Patch logrotate conf
diff --git a/varnish/templates/varnish.conf.j2 b/varnish/templates/varnish.conf.j2
new file mode 100644
index 00000000..275e8909
--- /dev/null
+++ b/varnish/templates/varnish.conf.j2
@@ -0,0 +1,5 @@
+# {{ ansible_managed }}
+
+[Service]
+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=/etc/varnish/reload-vcl.sh