From 97256bfa156fdf346fe420520c620bdc5ea551b5 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 20 Feb 2025 17:44:55 +0100 Subject: [PATCH] Solved docker_repository_path bug --- group_vars/all/14_service_provider.yml | 17 +++++++++-------- roles/docker-repository-setup/README.md | 8 +------- roles/docker-repository-setup/tasks/main.yml | 3 +-- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/group_vars/all/14_service_provider.yml b/group_vars/all/14_service_provider.yml index bc9e4056..548094cf 100644 --- a/group_vars/all/14_service_provider.yml +++ b/group_vars/all/14_service_provider.yml @@ -16,14 +16,15 @@ defaults_service_provider: logo: https://cloud.veen.world/s/logo_cymais_512x512/download favicon: https://cloud.veen.world/s/veen_world_favicon/download contact: - bluesky: "@{{administrator_username}}.{{domains.bluesky_api}}" - email: "contact@{{primary_domain}}" - mastodon: "@{{administrator_username}}@{{domains.mastodon}}" - matrix: "@{{administrator_username}}:{{domains.matrix_synapse}}" - peertube: "@{{administrator_username}}@{{domains.peertube}}" - pixelfed: "@{{administrator_username}}@{{domains.pixelfed}}" - phone: "+0 000 000 404" - wordpress: "@{{administrator_username}}@{{domains.wordpress[0]}}" + bluesky: "{{ '@' ~ administrator_username ~ '.' ~ domains.bluesky_api if 'bluesky' in group_names else '' }}" + email: "contact@{{ primary_domain }}" + mastodon: "{{ '@' ~ administrator_username ~ '@' ~ domains.mastodon if 'mastodon' in group_names else '' }}" + matrix: "{{ '@' ~ administrator_username ~ ':' ~ domains.matrix_synapse if 'matrix' in group_names else '' }}" + peertube: "{{ '@' ~ administrator_username ~ '@' ~ domains.peertube if 'peertube' in group_names else '' }}" + pixelfed: "{{ '@' ~ administrator_username ~ '@' ~ domains.pixelfed if 'pixelfed' in group_names else '' }}" + phone: "+0 000 000 404" + wordpress: "{{ '@' ~ administrator_username ~ '@' ~ domains.wordpress[0] if 'wordpress' in group_names else '' }}" + legal: editorial_responsible: "Johannes Gutenberg" source_code: "https://github.com/kevinveenbirkenbach/cymais" diff --git a/roles/docker-repository-setup/README.md b/roles/docker-repository-setup/README.md index 89855172..655173c8 100644 --- a/roles/docker-repository-setup/README.md +++ b/roles/docker-repository-setup/README.md @@ -5,7 +5,7 @@ This Ansible role sets up and manages your Docker repository. It ensures that th ## Features 🔧 - **Default Path Setup:** - Automatically sets a default `docker_repository_path` if not already defined. + Automatically sets a default `docker_repository_path` - **Repository Management:** Clones or updates your Docker repository from a specified Git repository. @@ -34,12 +34,6 @@ Ensure that you have set the following variables (either via your inventory, `gr - `docker_compose.directories.services`: The base directory where your Docker services are stored. The role will append `repository/` to this path to form `docker_repository_path`. -If `docker_repository_path` is not defined, the role will automatically set it to: - -```yaml -"{{ docker_compose.directories.services }}repository/" -``` - ## Author Kevin Veen-Birkenbach diff --git a/roles/docker-repository-setup/tasks/main.yml b/roles/docker-repository-setup/tasks/main.yml index 5b2af08b..2c6c7dd3 100644 --- a/roles/docker-repository-setup/tasks/main.yml +++ b/roles/docker-repository-setup/tasks/main.yml @@ -1,7 +1,6 @@ -- name: Set default docker_repository_path if not defined +- name: Set default docker_repository_path set_fact: docker_repository_path: "{{docker_compose.directories.services}}repository/" - when: docker_repository_path is not defined - name: pull docker repository git: