From 14b484dd37465a65e3657284d19ebec78dd9b30a Mon Sep 17 00:00:00 2001 From: Viyurz Date: Sat, 30 Mar 2024 11:58:59 +0100 Subject: [PATCH] Replace docker_projects_dir by project_dir variable. --- env.yml | 3 +-- roles/coturn/tasks/update.yml | 14 +++++++------- roles/coturn/vars/main.yml | 1 - roles/element/tasks/update.yml | 12 ++++++------ roles/element/vars/main.yml | 1 - roles/etebase/tasks/update.yml | 12 ++++++------ roles/etebase/vars/main.yml | 1 - roles/hedgedoc/tasks/update.yml | 10 +++++----- roles/hedgedoc/vars/main.yml | 1 - roles/homepage/tasks/update.yml | 10 +++++----- roles/homepage/vars/main.yml | 1 - roles/mailserver/tasks/update.yml | 10 +++++----- roles/mailserver/vars/main.yml | 1 - roles/searxng/tasks/update.yml | 12 ++++++------ roles/searxng/vars/main.yml | 1 - roles/synapse/tasks/update.yml | 14 +++++++------- roles/synapse/vars/main.yml | 1 - roles/syncthing/tasks/update.yml | 10 +++++----- roles/syncthing/vars/main.yml | 1 - roles/uptime-kuma/tasks/update.yml | 10 +++++----- roles/uptime-kuma/vars/main.yml | 1 - roles/vaultwarden/tasks/update.yml | 10 +++++----- roles/vaultwarden/vars/main.yml | 1 - 23 files changed, 63 insertions(+), 75 deletions(-) delete mode 100644 roles/coturn/vars/main.yml delete mode 100644 roles/element/vars/main.yml delete mode 100644 roles/etebase/vars/main.yml delete mode 100644 roles/hedgedoc/vars/main.yml delete mode 100644 roles/homepage/vars/main.yml delete mode 100644 roles/mailserver/vars/main.yml delete mode 100644 roles/searxng/vars/main.yml delete mode 100644 roles/synapse/vars/main.yml delete mode 100644 roles/syncthing/vars/main.yml delete mode 100644 roles/uptime-kuma/vars/main.yml delete mode 100644 roles/vaultwarden/vars/main.yml diff --git a/env.yml b/env.yml index 099c080..ca578f0 100644 --- a/env.yml +++ b/env.yml @@ -1,8 +1,7 @@ domain: viyurz.fr timezone: "Europe/Paris" host_uid: 1000 -docker_projects_dir: "{{ ansible_env['HOME'] }}/docker-projects" -project_dir: "{{ docker_projects_dir }}/{{ role_name }}" +project_dir: "{{ ansible_env['HOME'] }}/docker-projects/{{ role_name }}" docker_host: "unix:///run/user/{{ host_uid }}/docker.sock" # UID shift for mapping between host & containers diff --git a/roles/coturn/tasks/update.yml b/roles/coturn/tasks/update.yml index 6a7388e..1ef0a23 100644 --- a/roles/coturn/tasks/update.yml +++ b/roles/coturn/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ coturn_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ coturn_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ coturn_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -14,7 +14,7 @@ - name: Template turnserver.conf to project directory template: src: turnserver.conf - dest: "{{ coturn_project_dir }}/turnserver.conf" + dest: "{{ project_dir }}/turnserver.conf" owner: "{{ host_uid }}" mode: '640' # Store result to restart services if the file changed @@ -23,7 +23,7 @@ # Separate task because template module cannot chown/chgrp to a non-existing user/group - name: "Change group of turnserver.conf to coturn GID ({{ users['coturn'] + uid_shift }})" file: - path: "{{ coturn_project_dir }}/turnserver.conf" + path: "{{ project_dir }}/turnserver.conf" group: "{{ users['coturn'] + uid_shift }}" become: true @@ -62,7 +62,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ coturn_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -76,6 +76,6 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ coturn_project_dir }}" + project_src: "{{ project_dir }}" # Restart if config file(s) changed restarted: "{{ coturn_template_turnserver_result['changed'] | bool }}" diff --git a/roles/coturn/vars/main.yml b/roles/coturn/vars/main.yml deleted file mode 100644 index 0f1d007..0000000 --- a/roles/coturn/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -coturn_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/element/tasks/update.yml b/roles/element/tasks/update.yml index c5638b6..e667f3c 100644 --- a/roles/element/tasks/update.yml +++ b/roles/element/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ element_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ element_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ element_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -14,7 +14,7 @@ - name: Template config.json to project directory template: src: config.json - dest: "{{ element_project_dir }}/config.json" + dest: "{{ project_dir }}/config.json" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '644' @@ -22,7 +22,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ element_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -36,6 +36,6 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ element_project_dir }}" + project_src: "{{ project_dir }}" # Restart if config file(s) changed restarted: "{{ element_template_config_result['changed'] | bool }}" diff --git a/roles/element/vars/main.yml b/roles/element/vars/main.yml deleted file mode 100644 index c4d0c56..0000000 --- a/roles/element/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -element_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/etebase/tasks/update.yml b/roles/etebase/tasks/update.yml index a459924..176452a 100644 --- a/roles/etebase/tasks/update.yml +++ b/roles/etebase/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ etebase_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ etebase_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ etebase_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -14,7 +14,7 @@ - name: Template etebase-server.ini to project directory template: src: etebase-server.ini - dest: "{{ etebase_project_dir }}/etebase-server.ini" + dest: "{{ project_dir }}/etebase-server.ini" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '644' @@ -30,7 +30,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ etebase_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -50,4 +50,4 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ etebase_project_dir }}" + project_src: "{{ project_dir }}" diff --git a/roles/etebase/vars/main.yml b/roles/etebase/vars/main.yml deleted file mode 100644 index 8dd9ef6..0000000 --- a/roles/etebase/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -etebase_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/hedgedoc/tasks/update.yml b/roles/hedgedoc/tasks/update.yml index 2600d87..358acae 100644 --- a/roles/hedgedoc/tasks/update.yml +++ b/roles/hedgedoc/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ hedgedoc_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ hedgedoc_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ hedgedoc_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -31,7 +31,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ hedgedoc_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -51,4 +51,4 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ hedgedoc_project_dir }}" + project_src: "{{ project_dir }}" diff --git a/roles/hedgedoc/vars/main.yml b/roles/hedgedoc/vars/main.yml deleted file mode 100644 index 1324eb1..0000000 --- a/roles/hedgedoc/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -hedgedoc_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/homepage/tasks/update.yml b/roles/homepage/tasks/update.yml index 0f4ba4f..666efee 100644 --- a/roles/homepage/tasks/update.yml +++ b/roles/homepage/tasks/update.yml @@ -1,19 +1,19 @@ -- name: "Create {{ homepage_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ homepage_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ homepage_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' - name: Pull project services community.docker.docker_compose: - project_src: "{{ homepage_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -27,4 +27,4 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ homepage_project_dir }}" + project_src: "{{ project_dir }}" diff --git a/roles/homepage/vars/main.yml b/roles/homepage/vars/main.yml deleted file mode 100644 index 9f10282..0000000 --- a/roles/homepage/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -homepage_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/mailserver/tasks/update.yml b/roles/mailserver/tasks/update.yml index 618e36a..1a84283 100644 --- a/roles/mailserver/tasks/update.yml +++ b/roles/mailserver/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ mailserver_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ mailserver_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ mailserver_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -55,7 +55,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ mailserver_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -75,4 +75,4 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ mailserver_project_dir }}" + project_src: "{{ project_dir }}" diff --git a/roles/mailserver/vars/main.yml b/roles/mailserver/vars/main.yml deleted file mode 100644 index 460e423..0000000 --- a/roles/mailserver/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -mailserver_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/searxng/tasks/update.yml b/roles/searxng/tasks/update.yml index 50ceae4..d127555 100644 --- a/roles/searxng/tasks/update.yml +++ b/roles/searxng/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ searxng_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ searxng_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ searxng_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -14,7 +14,7 @@ - name: Copy settings.yml and limiter.toml to project directory copy: src: "{{ role_path }}/files/" - dest: "{{ searxng_project_dir }}" + dest: "{{ project_dir }}" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '644' @@ -23,7 +23,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ searxng_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -37,6 +37,6 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ searxng_project_dir }}" + project_src: "{{ project_dir }}" # Restart if config file(s) changed restarted: "{{ searxng_copy_files_result['changed'] | bool }}" diff --git a/roles/searxng/vars/main.yml b/roles/searxng/vars/main.yml deleted file mode 100644 index 30462f4..0000000 --- a/roles/searxng/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -searxng_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/synapse/tasks/update.yml b/roles/synapse/tasks/update.yml index 5933275..0878d4b 100644 --- a/roles/synapse/tasks/update.yml +++ b/roles/synapse/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ synapse_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ synapse_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ synapse_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -14,7 +14,7 @@ - name: Template homeserver.yaml to project directory template: src: homeserver.yaml - dest: "{{ synapse_project_dir }}/homeserver.yaml" + dest: "{{ project_dir }}/homeserver.yaml" owner: "{{ host_uid }}" mode: '640' # Store result to restart services if the file changed @@ -23,7 +23,7 @@ # Separate task because template module cannot chown/chgrp to a non-existing user/group - name: "Change group of homeserver.yaml to synapse GID ({{ users['synapse'] + uid_shift }})" file: - path: "{{ synapse_project_dir }}/homeserver.yaml" + path: "{{ project_dir }}/homeserver.yaml" group: "{{ users['synapse'] + uid_shift }}" become: true @@ -47,7 +47,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ synapse_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -67,6 +67,6 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ synapse_project_dir }}" + project_src: "{{ project_dir }}" # Restart if config file(s) changed restarted: "{{ synapse_template_homeserver_result['changed'] | bool }}" diff --git a/roles/synapse/vars/main.yml b/roles/synapse/vars/main.yml deleted file mode 100644 index e4adca5..0000000 --- a/roles/synapse/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -synapse_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/syncthing/tasks/update.yml b/roles/syncthing/tasks/update.yml index e9e592d..9682759 100644 --- a/roles/syncthing/tasks/update.yml +++ b/roles/syncthing/tasks/update.yml @@ -1,19 +1,19 @@ -- name: "Create {{ syncthing_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ syncthing_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ syncthing_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' - name: Pull project services community.docker.docker_compose: - project_src: "{{ syncthing_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -27,4 +27,4 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ syncthing_project_dir }}" + project_src: "{{ project_dir }}" diff --git a/roles/syncthing/vars/main.yml b/roles/syncthing/vars/main.yml deleted file mode 100644 index 45bb45b..0000000 --- a/roles/syncthing/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -syncthing_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/uptime-kuma/tasks/update.yml b/roles/uptime-kuma/tasks/update.yml index d0c010b..7afaec8 100644 --- a/roles/uptime-kuma/tasks/update.yml +++ b/roles/uptime-kuma/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ uptime_kuma_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ uptime_kuma_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml to project directory template: src: docker-compose.yaml - dest: "{{ uptime_kuma_project_dir }}/docker-compose.yaml" + dest: "{{ project_dir }}/docker-compose.yaml" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -22,7 +22,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ uptime_kuma_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -42,4 +42,4 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ uptime_kuma_project_dir }}" + project_src: "{{ project_dir }}" diff --git a/roles/uptime-kuma/vars/main.yml b/roles/uptime-kuma/vars/main.yml deleted file mode 100644 index b35f815..0000000 --- a/roles/uptime-kuma/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -uptime_kuma_project_dir: "{{ docker_projects_dir }}/{{ role_name }}" diff --git a/roles/vaultwarden/tasks/update.yml b/roles/vaultwarden/tasks/update.yml index 7db2e53..147498b 100644 --- a/roles/vaultwarden/tasks/update.yml +++ b/roles/vaultwarden/tasks/update.yml @@ -1,12 +1,12 @@ -- name: "Create {{ vaultwarden_project_dir }} project directory" +- name: "Create {{ project_dir }} project directory" file: - path: "{{ vaultwarden_project_dir }}" + path: "{{ project_dir }}" state: directory - name: Template docker-compose.yaml & .env to project directory template: src: "{{ item }}" - dest: "{{ vaultwarden_project_dir }}/{{ item }}" + dest: "{{ project_dir }}/{{ item }}" owner: "{{ host_uid }}" group: "{{ host_uid }}" mode: '640' @@ -25,7 +25,7 @@ - name: Pull project services community.docker.docker_compose: - project_src: "{{ vaultwarden_project_dir }}" + project_src: "{{ project_dir }}" recreate: never pull: true debug: true @@ -45,4 +45,4 @@ - name: Create/Restart project services community.docker.docker_compose: - project_src: "{{ vaultwarden_project_dir }}" + project_src: "{{ project_dir }}" diff --git a/roles/vaultwarden/vars/main.yml b/roles/vaultwarden/vars/main.yml deleted file mode 100644 index 50892d2..0000000 --- a/roles/vaultwarden/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -vaultwarden_project_dir: "{{ docker_projects_dir }}/{{ role_name }}"