varnish: Allow the systemd template to be overriden with a template outside of the role
All checks were successful
Ansible Lint |Total|New|Outstanding|Fixed|Trend |:-:|:-:|:-:|:-:|:-: |2786|4|2782|6|:+1: Reference build: <a href="https://jenkins.evolix.org/job/gitea/job/ansible-roles/job/unstable/273//ansiblelint">Evolix » ansible-roles » unstable #273</a>
gitea/ansible-roles/pipeline/head This commit looks good

This commit is contained in:
Ludovic Poujol 2023-06-19 16:09:40 +02:00
parent 2e73bf09f7
commit aec5406043
3 changed files with 8 additions and 2 deletions

View file

@ -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

View file

@ -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
varnish_tmp_dir: /var/tmp-vcache

View file

@ -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