From 6165124acb7c85ad3798f65df52ff04e77033a9a Mon Sep 17 00:00:00 2001 From: VC Date: Sun, 9 Mar 2025 16:53:59 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91:=20specific=20the=20absolute=20exc?= =?UTF-8?q?lude=20list=20to=20avoid=20conflicts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/firefly3/tasks/firefly3.yml | 2 +- roles/freshrss/tasks/freshrss.yml | 2 +- roles/koillection/tasks/main.yml | 2 +- roles/shaarli/tasks/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/firefly3/tasks/firefly3.yml b/roles/firefly3/tasks/firefly3.yml index 9601da6..97ab0bc 100644 --- a/roles/firefly3/tasks/firefly3.yml +++ b/roles/firefly3/tasks/firefly3.yml @@ -22,7 +22,7 @@ owner: root group: www-data mode: "a-rwx,u+rwX,g+rX" - exclude: "{{ firefly3_userdata_app_dirs }}" + exclude: "{{ firefly3_userdata_app_dirs | map('regex_replace', '^', './') }}" - name: Put config file ansible.builtin.template: diff --git a/roles/freshrss/tasks/freshrss.yml b/roles/freshrss/tasks/freshrss.yml index 4221747..fa0643a 100644 --- a/roles/freshrss/tasks/freshrss.yml +++ b/roles/freshrss/tasks/freshrss.yml @@ -23,7 +23,7 @@ group: www-data mode: "a-rwx,u+rwX,g+rX" extra_opts: ['--strip-components=1'] - exclude: "{{ freshrss_userdata_app_dirs }}" + exclude: "{{ freshrss_userdata_app_dirs | map('regex_replace', '^', 'FreshRSS-' ~ freshrss_version ~ '/') }}" ## Ensure the data dirs exist, populate them if not - name: Create data home diff --git a/roles/koillection/tasks/main.yml b/roles/koillection/tasks/main.yml index 4be1e76..0642a95 100644 --- a/roles/koillection/tasks/main.yml +++ b/roles/koillection/tasks/main.yml @@ -26,7 +26,7 @@ group: www-data mode: "a-rwx,u+rwX,g+rX" extra_opts: ['--strip-components=1'] - exclude: "{{ koillection_userdata_app_dirs }}" + exclude: "{{ koillection_userdata_app_dirs | map('regex_replace', '^', 'public/') }}" - name: Put config file ansible.builtin.template: diff --git a/roles/shaarli/tasks/main.yml b/roles/shaarli/tasks/main.yml index 6c0867e..5d9898f 100644 --- a/roles/shaarli/tasks/main.yml +++ b/roles/shaarli/tasks/main.yml @@ -23,7 +23,7 @@ group: www-data mode: "a-rwx,u+rwX,g+rX" extra_opts: ['--strip-components=1'] - exclude: "{{ shaarli_userdata_app_dirs }}" + exclude: "{{ shaarli_userdata_app_dirs | map('regex_replace', '^', 'Shaarli/') }}" - name: Check writable dirs ansible.builtin.file: