diff --git a/CHANGELOG.md b/CHANGELOG.md index 0887de1e..a274dbb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * evolinux-users: remove Stretch references in tasks that also apply to next Debian versions * mysql: improve shell syntax for mysql_skip script * pbbouncer: minor fixes +* varnish: Allow the systemd template to be overriden with a template outside of the role ### Fixed diff --git a/varnish/defaults/main.yml b/varnish/defaults/main.yml index ec8a251e..560e241f 100644 --- a/varnish/defaults/main.yml +++ b/varnish/defaults/main.yml @@ -16,8 +16,10 @@ varnish_thread_pool_max: 5000 varnish_jail: "unix,user=vcache" varnish_additional_options: "" +varnish_systemd_override_template: Null + varnish_config_file: /etc/varnish/default.vcl -varnish_update_config: True +varnish_update_config: true varnish_secret_file: /etc/varnish/secret -varnish_tmp_dir: /var/tmp-vcache \ No newline at end of file +varnish_tmp_dir: /var/tmp-vcache diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml index 6cdb92db..585688b9 100644 --- a/varnish/tasks/main.yml +++ b/varnish/tasks/main.yml @@ -80,6 +80,7 @@ when: - varnish_package_facts['version'] is version('4', '>=') - varnish_package_facts['version'] is version('6', '<') + - varnish_systemd_override_template | length == 0 tags: - varnish - config @@ -91,6 +92,7 @@ when: - varnish_package_facts['version'] is version('6', '>=') - varnish_package_facts['version'] is version('7', '<') + - varnish_systemd_override_template | length == 0 tags: - varnish - config @@ -101,6 +103,7 @@ varnish_systemd_override_template: override.conf.varnish7.j2 when: - varnish_package_facts['version'] is version('7', '>=') + - varnish_systemd_override_template | length == 0 tags: - varnish - config