From 1ea9e5f43ecfe8ff2e008801351276e0955c0d51 Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 14 Mar 2023 11:20:45 +0200 Subject: [PATCH 1/3] cachetool_bin_per_project --- roles/_init/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml index effa2790..179705e2 100644 --- a/roles/_init/tasks/main.yml +++ b/roles/_init/tasks/main.yml @@ -107,7 +107,7 @@ - name: Define opcache cachetool path. ansible.builtin.set_fact: - cachetool_bin: "{{ cachetool_bin | default('/home/{{ deploy_user }}/.bin/cachetool.phar') }}" + cachetool_bin: "{{ cachetool_bin | default('{{ build_base_path }}/cachetool.phar') }}" - name: Ensure we have a cachetool binary. ansible.builtin.import_role: From 620cc100863b282a1c0652d2f84bf37a7dc4f2fb Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 14 Mar 2023 12:16:41 +0200 Subject: [PATCH 2/3] cachetool_bin_per_site_fix --- roles/_init/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml index 179705e2..f4fe5823 100644 --- a/roles/_init/tasks/main.yml +++ b/roles/_init/tasks/main.yml @@ -106,8 +106,15 @@ - _project_type_task_result.stat.exists - name: Define opcache cachetool path. + ansible.builtin.set_fact: + cachetool_bin: "{{ cachetool_bin | default('{{ deploy_base_path }}/cachetool.phar') }}" + +- name: Define opcache cachetool path if SquashFS deploy. ansible.builtin.set_fact: cachetool_bin: "{{ cachetool_bin | default('{{ build_base_path }}/cachetool.phar') }}" + when: + - deploy_code.mount_type is defined + - deploy_code.mount_type == "squashfs" - name: Ensure we have a cachetool binary. ansible.builtin.import_role: From bfffe0a0d375797246e051bad2caac977ff4ac92 Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 14 Mar 2023 13:25:04 +0200 Subject: [PATCH 3/3] cachetool_bin_per_site_fix2 --- roles/_init/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml index f4fe5823..e939def3 100644 --- a/roles/_init/tasks/main.yml +++ b/roles/_init/tasks/main.yml @@ -108,6 +108,7 @@ - name: Define opcache cachetool path. ansible.builtin.set_fact: cachetool_bin: "{{ cachetool_bin | default('{{ deploy_base_path }}/cachetool.phar') }}" + when: deploy_code.mount_type != "squashfs" - name: Define opcache cachetool path if SquashFS deploy. ansible.builtin.set_fact: