diff --git a/playbook-authelia.yml b/playbook-authelia.yml index 8667a87..992a02e 100644 --- a/playbook-authelia.yml +++ b/playbook-authelia.yml @@ -10,7 +10,7 @@ vars: app_name: "authelia" app_user: "{{ app_name }}" - base_dir: "/home/{{ app_user }}" + base_dir: "{{ (application_dir, app_name) | path_join }}" config_dir: "{{ (base_dir, 'config') | path_join }}" tasks: @@ -29,6 +29,7 @@ group: "{{ app_user }}" mode: "0700" loop: + - "{{ base_dir }}" - "{{ config_dir }}" - name: "Copy users file" diff --git a/playbook-caddyproxy.yml b/playbook-caddyproxy.yml index c55ed2b..ddd6b3c 100644 --- a/playbook-caddyproxy.yml +++ b/playbook-caddyproxy.yml @@ -9,7 +9,7 @@ vars: app_name: "caddyproxy" app_user: "{{ app_name }}" - base_dir: "/home/{{ app_user }}" + base_dir: "{{ (application_dir, app_name) | path_join }}" data_dir: "{{ (base_dir, 'data') | path_join }}" config_dir: "{{ (base_dir, 'config') | path_join }}" @@ -33,6 +33,7 @@ group: "{{ app_user }}" mode: "0770" loop: + - "{{ base_dir }}" - "{{ data_dir }}" - "{{ config_dir }}" - "{{ caddy_file_dir }}" diff --git a/playbook-dozzle.yml b/playbook-dozzle.yml index 7d96079..87cf8a4 100644 --- a/playbook-dozzle.yml +++ b/playbook-dozzle.yml @@ -9,7 +9,7 @@ vars: app_name: "dozzle" app_user: "{{ app_name }}" - base_dir: "/home/{{ app_user }}" + base_dir: "{{ (application_dir, app_name) | path_join }}" tasks: - name: "Create user and environment" @@ -19,6 +19,16 @@ owner_name: "{{ app_user }}" owner_extra_groups: ["docker"] + - name: "Create internal application directories" + ansible.builtin.file: + path: "{{ item }}" + state: "directory" + owner: "{{ app_user }}" + group: "{{ app_user }}" + mode: "0770" + loop: + - "{{ base_dir }}" + - name: "Copy docker compose file" ansible.builtin.template: src: "./files/{{ app_name }}/docker-compose.yml.j2" diff --git a/playbook-netdata.yml b/playbook-netdata.yml index 8554c9d..4b7ae5e 100644 --- a/playbook-netdata.yml +++ b/playbook-netdata.yml @@ -9,7 +9,7 @@ vars: app_name: "netdata" app_user: "{{ app_name }}" - base_dir: "/home/{{ app_user }}" + base_dir: "{{ (application_dir, app_name) | path_join }}" config_dir: "{{ (base_dir, 'config') | path_join }}" config_go_d_dir: "{{ (config_dir, 'go.d') | path_join }}" data_dir: "{{ (base_dir, 'data') | path_join }}" @@ -30,9 +30,10 @@ group: "{{ app_user }}" mode: "0770" loop: + - "{{ base_dir }}" + - "{{ data_dir }}" - "{{ config_dir }}" - "{{ config_go_d_dir }}" - - "{{ data_dir }}" - name: "Copy netdata config file" ansible.builtin.template: diff --git a/playbook-rssbridge.yml b/playbook-rssbridge.yml index 37afd52..5510afc 100644 --- a/playbook-rssbridge.yml +++ b/playbook-rssbridge.yml @@ -9,7 +9,7 @@ vars: app_name: "rssbridge" app_user: "{{ app_name }}" - base_dir: "/home/{{ app_user }}" + base_dir: "{{ (application_dir, app_name) | path_join }}" tasks: - name: "Create user and environment" @@ -19,6 +19,16 @@ owner_name: "{{ app_user }}" owner_extra_groups: ["docker"] + - name: "Create internal application directories" + ansible.builtin.file: + path: "{{ item }}" + state: "directory" + owner: "{{ app_user }}" + group: "{{ app_user }}" + mode: "0770" + loop: + - "{{ base_dir }}" + - name: "Copy docker compose file" ansible.builtin.template: src: "./files/{{ app_name }}/docker-compose.yml.j2"