From 832094843a439ab0fee5c1260af57da5a3cf391b Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Sat, 28 Dec 2024 12:07:20 +0100 Subject: [PATCH] :truck: roles: dehydrated: Use namespaced role name In "ansible-role-dehydrated" the words "ansible" and "role" are redundant, because implicit anyway. What actually helps here is using a namespaced name in the format galaxy would use, to make clear it's an external role, and where it comes from. Link: https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#installing-multiple-roles-from-a-file --- host-krypton.yml | 2 +- host-pottwal.yml | 2 +- host-radon.yml | 2 +- host-tau.yml | 2 +- host-wittgenstein.yml | 2 +- requirements.yml | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/host-krypton.yml b/host-krypton.yml index 6d9b144..749af49 100644 --- a/host-krypton.yml +++ b/host-krypton.yml @@ -22,7 +22,7 @@ # role 'docker_setup' applied through group 'docker_host' - role: apache - role: apache_letsencrypt # Uses configuration from dehydrated setup - - role: ansible-role-dehydrated + - role: 24367dfa.dehydrated vars: dehydrated_contact_email: "{{ server_admin }}" dehydrated_domains: diff --git a/host-pottwal.yml b/host-pottwal.yml index f2cff3e..ca3cf05 100644 --- a/host-pottwal.yml +++ b/host-pottwal.yml @@ -6,7 +6,7 @@ # role 'docker_setup' applied through group 'docker_host' - role: apache - role: apache_letsencrypt # Uses configuration from dehydrated setup - - role: ansible-role-dehydrated + - role: 24367dfa.dehydrated vars: dehydrated_contact_email: "{{ server_admin }}" dehydrated_domains: diff --git a/host-radon.yml b/host-radon.yml index 352232e..710eabf 100644 --- a/host-radon.yml +++ b/host-radon.yml @@ -24,7 +24,7 @@ # role 'docker_setup' applied through group 'docker_host' - role: apache - role: apache_letsencrypt # Uses configuration from dehydrated setup - - role: ansible-role-dehydrated + - role: 24367dfa.dehydrated vars: dehydrated_contact_email: "{{ server_admin }}" dehydrated_domains: diff --git a/host-tau.yml b/host-tau.yml index a1d4b46..f818bc7 100644 --- a/host-tau.yml +++ b/host-tau.yml @@ -35,7 +35,7 @@ - name: Setup Dehydrated include_role: - name: ansible-role-dehydrated + name: 24367dfa.dehydrated vars: dehydrated_contact_email: "{{ server_admin }}" dehydrated_domains: diff --git a/host-wittgenstein.yml b/host-wittgenstein.yml index f4b2190..c770b5f 100644 --- a/host-wittgenstein.yml +++ b/host-wittgenstein.yml @@ -8,7 +8,7 @@ docker_data_root: "/srv/docker" - role: apache - role: apache_letsencrypt # Uses configuration from dehydrated setup - - role: ansible-role-dehydrated + - role: 24367dfa.dehydrated vars: dehydrated_contact_email: "{{ server_admin }}" - role: penguineer.dehydrated_cron diff --git a/requirements.yml b/requirements.yml index 7c66b00..eb8fb4e 100644 --- a/requirements.yml +++ b/requirements.yml @@ -5,7 +5,8 @@ roles: - name: adriagalin.timezone src: git+https://github.com/adriagalin/ansible.timezone.git version: 4.0.0 - - src: git+https://github.com/24367dfa/ansible-role-dehydrated.git + - name: 24367dfa.dehydrated + src: git+https://github.com/24367dfa/ansible-role-dehydrated.git version: 2.0.0 - src: https://github.com/penguineer/ansible-role-dehydrated_cron.git version: v1.1.0