From 70592047668408dbce69088443444a7839e8b406 Mon Sep 17 00:00:00 2001
From: Alexander Dahl <alex@netz39.de>
Date: Sat, 28 Dec 2024 11:55:00 +0100
Subject: [PATCH 1/4] :truck: roles: timezone: Override with galaxy name
The repository name differs from the galaxy name. Although not strictly
necessary, makes origin of role more clear in code and would allow
easier switching between galaxy, and git. Using the namespaced name
makes it clear it's an external role. Same name as in role
documentation now. No change in actual role or version of role.
Link: https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#installing-multiple-roles-from-a-file
---
group-all.yml | 2 +-
requirements.yml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/group-all.yml b/group-all.yml
index cb380e2..2d95128 100644
--- a/group-all.yml
+++ b/group-all.yml
@@ -8,7 +8,7 @@
ansible_python_interpreter: /usr/bin/python3
roles:
- - role: ansible.timezone
+ - role: adriagalin.timezone
vars:
ag_timezone: "{{ timezone }}"
- role: users
diff --git a/requirements.yml b/requirements.yml
index 5a23b6f..7c66b00 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -2,7 +2,8 @@
roles:
- src: hifis.unattended_upgrades
version: v3.2.1
- - src: git+https://github.com/adriagalin/ansible.timezone.git
+ - 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
version: 2.0.0
From 832094843a439ab0fee5c1260af57da5a3cf391b Mon Sep 17 00:00:00 2001
From: Alexander Dahl <alex@netz39.de>
Date: Sat, 28 Dec 2024 12:07:20 +0100
Subject: [PATCH 2/4] :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
From 605eca4c38cd9f0dd118bb504b9b4685ef506a77 Mon Sep 17 00:00:00 2001
From: Alexander Dahl <alex@netz39.de>
Date: Sat, 28 Dec 2024 12:16:21 +0100
Subject: [PATCH 3/4] :truck: roles: dehydrated_cron: Use namespaced name
Removes the redundant words "ansible" and "role" from the role name
originating from the Git repo name, and uses the author's name as
namespace instead. This makes it easier to recognize as external role.
Note: the host-wittgenstein recipe already used that new name, but we
did not set it up in requirements, yet. (How did that ever work?)
Link: https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#installing-multiple-roles-from-a-file
Fixes: f4db6fa39564 ("Add Ansible setup for wittgenstein")
---
host-krypton.yml | 2 +-
host-pottwal.yml | 2 +-
host-radon.yml | 2 +-
host-tau.yml | 2 +-
requirements.yml | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/host-krypton.yml b/host-krypton.yml
index 749af49..7a45ca0 100644
--- a/host-krypton.yml
+++ b/host-krypton.yml
@@ -27,7 +27,7 @@
dehydrated_contact_email: "{{ server_admin }}"
dehydrated_domains:
- name: entities-validation.svc.n39.eu
- - role: ansible-role-dehydrated_cron
+ - role: penguineer.dehydrated_cron
tasks:
diff --git a/host-pottwal.yml b/host-pottwal.yml
index ca3cf05..9df71c4 100644
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@@ -25,7 +25,7 @@
- name: "{{ grafana_domain_name }}"
- name: "{{ homebox_domain_name }}"
- name: spaceapi.n39.eu
- - role: ansible-role-dehydrated_cron
+ - role: penguineer.dehydrated_cron
- role: dd24_dyndns_cron
# variables are set in the inventory
- role: desec_dyndns_cron
diff --git a/host-radon.yml b/host-radon.yml
index 710eabf..58e55fa 100644
--- a/host-radon.yml
+++ b/host-radon.yml
@@ -32,7 +32,7 @@
- name: rabbitmq.n39.eu
- name: pwr-meter-pulse-gw-19i.svc.n39.eu
- name: labelprinter.n39.eu
- - role: ansible-role-dehydrated_cron
+ - role: penguineer.dehydrated_cron
tasks:
diff --git a/host-tau.yml b/host-tau.yml
index f818bc7..665f926 100644
--- a/host-tau.yml
+++ b/host-tau.yml
@@ -21,7 +21,7 @@
roles:
# role 'docker_setup' applied through group 'docker_host'
- role: apache
- - role: ansible-role-dehydrated_cron
+ - role: penguineer.dehydrated_cron
tasks:
- name: Setup docker network
diff --git a/requirements.yml b/requirements.yml
index eb8fb4e..ee1cf07 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -8,7 +8,8 @@ roles:
- 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
+ - name: penguineer.dehydrated_cron
+ src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
version: v1.1.0
- src: git+https://github.com/maz3max/ble-keykeeper-role.git
version: v1.1.0
From cf10544a0203a7039655d3a86720755ffcda7640 Mon Sep 17 00:00:00 2001
From: Alexander Dahl <alex@netz39.de>
Date: Sat, 28 Dec 2024 12:24:16 +0100
Subject: [PATCH 4/4] :truck: roles: ble_keykeeper: Use namespaced name
Removed redundant word "role" from role name, which originates from git
repo name. Makes it clear we use an external role here.
Link: https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#installing-multiple-roles-from-a-file
---
host-platon.yml | 2 +-
requirements.yml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/host-platon.yml b/host-platon.yml
index b0623ad..41d033c 100644
--- a/host-platon.yml
+++ b/host-platon.yml
@@ -6,7 +6,7 @@
door_open_command: '/home/pi/sesame-open.sh'
ble_keykeeper_dir: '/home/pi/netz39_ble_keykeeper'
roles:
- - role: ble-keykeeper-role
+ - role: maz3max.ble_keykeeper
vars:
ble_keykeeper_user: "{{ gatekeeper_user }}"
ble_keykeeper_group: "{{ gatekeeper_user }}"
diff --git a/requirements.yml b/requirements.yml
index ee1cf07..975ae64 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -11,7 +11,8 @@ roles:
- name: penguineer.dehydrated_cron
src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
version: v1.1.0
- - src: git+https://github.com/maz3max/ble-keykeeper-role.git
+ - name: maz3max.ble_keykeeper
+ src: git+https://github.com/maz3max/ble-keykeeper-role.git
version: v1.1.0
- src: lespocky.telegraf_docker_in_docker
version: v0.2.1