From 7f3f7b3e04cd00f5635712bafff635371ec285a0 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 2 Nov 2022 22:30:09 +0100 Subject: [PATCH] varnish: fix tags and variables --- varnish/defaults/main.yml | 2 ++ varnish/tasks/main.yml | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/varnish/defaults/main.yml b/varnish/defaults/main.yml index 2de75a15..acc9b114 100644 --- a/varnish/defaults/main.yml +++ b/varnish/defaults/main.yml @@ -18,3 +18,5 @@ varnish_additional_options: "" varnish_config_file: /etc/varnish/default.vcl varnish_secret_file: /etc/varnish/secret + +varnish_tmp_dir: /var/tmp-vcache \ No newline at end of file diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml index 286d49dd..67fe2d6e 100644 --- a/varnish/tasks/main.yml +++ b/varnish/tasks/main.yml @@ -48,16 +48,16 @@ state: directory tags: - varnish + - config -- name: Rename legacy systemd override - command: mv /etc/systemd/system/varnish.service.d/evolinux.conf /etc/systemd/system/varnish.service.d/override.conf - args: - removes: /etc/systemd/system/varnish.service.d/evolinux.conf - creates: /etc/systemd/system/varnish.service.d/override.conf +- name: Remove legacy systemd override + file: + dest: /etc/systemd/system/varnish.service.d/evolinux.conf notify: - reload systemd tags: - varnish + - config - name: Varnish systemd override template (Varnish 4 and 5) set_fact: @@ -65,6 +65,10 @@ when: - varnish_package_facts['version'] is version('4', '>=') - varnish_package_facts['version'] is version('6', '<') + tags: + - varnish + - config + - update-config - name: Varnish systemd override template (Varnish 6) set_fact: @@ -72,12 +76,20 @@ when: - varnish_package_facts['version'] is version('6', '>=') - varnish_package_facts['version'] is version('7', '<') + tags: + - varnish + - config + - update-config - name: Varnish systemd override template (Varnish 7 and later) set_fact: varnish_systemd_override_template: override.conf.varnish7.j2 when: - varnish_package_facts['version'] is version('7', '>=') + tags: + - varnish + - config + - update-config - name: Override Varnish systemd unit template: