Reworking varnish role pr devel 2.x

roles/debian/varnish_config/defaults/main.yml

@@ -1,6 +1,12 @@
 ---
 # Defaults file for varnish_config, other variables exist from importing geerlingguy.varnish and can be overriden
 
+varnish_pid: /run/varnishd.pid
+limit_nofile: 131072
+limit_memlock: 82000
+limit_core: infinity
+tasks_max: infinity
+varnish_storage: "malloc,{{ ansible_facts.memtotal_mb // 10 }}M"
 varnish_config:
   # List of IPs that are allowed to ask for content purge.
   allowed_purge_IP: []
@@ -18,9 +24,3 @@ varnish_config:
   # Provide an alternative filename if you are providing a template.
   template_filename: default.vcl
   # Varnish systemd overrides to make varnish consistent even after upgrades
-  varnish_pid: /run/varnishd.pid
-  limit_nofile: 131072
-  limit_memlock: 85983232
-  limit_core: infinity
-  tasks_max: infinity
-  varnish_storage: "malloc,{{ ansible_facts.memtotal_mb // 10 }}M"

roles/debian/varnish_config/templates/varnish.service.j2

@@ -6,21 +6,22 @@ After=network-online.target
 Type=forking
 KillMode=process
 
-PIDFile= {{ varnish_config.varnish_pid }}
+PIDFile= {{ varnish_pid }}
 
 # Maximum number of open files (for ulimit -n)
-LimitNOFILE= {{ varnish_config.limit_nofile }}
+LimitNOFILE= {{ limit_nofile }}
 
 # Locked shared memory
-LimitMEMLOCK= {{ varnish_config.limit_memlock }}
+LimitMEMLOCK= {{ limit_memlock }}
 
 # Enable this to avoid "fork failed" on reload.
-TasksMax= {{ varnish_config.tasks_max }}
+TasksMax= {{ tasks_max }}
 
 # Maximum size of the corefile.
-LimitCORE= {{ varnish_config.limit_core }}
+LimitCORE= {{ limit_core }}
+
+ExecStart=/usr/sbin/varnishd -a :80 -T 127.0.0.1:6082 -P /run/varnishd.pid -f /etc/varnish/default.vcl -S /etc/varnish/secret -s {{ varnish_storage }}
 
-ExecStart=/usr/sbin/varnishd -a :80 -T 127.0.0.1:6082 -P /run/varnishd.pid -f /etc/varnish/default.vcl -S /etc/varnish/secret -s {{ varnish_config.varnish_storage }}
 ExecReload=/usr/sbin/varnishreload
 
 Restart=on-failure