From 6addc5cb944bf43b41dbb08b8b352aeb4b4ddc47 Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Wed, 3 Apr 2024 16:18:25 +0200
Subject: [PATCH] role names

---
 .ansible-lint                   | 18 ++++++++----------
 .gitignore                      | 16 ++++++++--------
 playbooks/1_bootstrap.yml       |  2 +-
 playbooks/3_service/ansible.yml |  2 +-
 playbooks/3_service/docker.yml  |  6 +++---
 playbooks/base/packages.yml     |  2 +-
 playbooks/base/ufw.yml          |  2 +-
 7 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index 64923c6b..5f8b00a8 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -12,16 +12,14 @@ exclude_paths:
   - .gitlab-ci.yml
   - friedhof/
   - playbooks/on-off
-  - roles/geerlingguy-ansible-role-pip
-  - roles/pyratlabs-ansible-role-k3s
-  - roles/robertdebock-ansible-role-bootstrap
-  - roles/gantsign-ansible-role-ctop
-  - roles/geerlingguy-ansible-role-docker
-  - roles/geerlingguy-ansible-role-helm
-  - roles/geerlingguy-ansible-role-nfs
-  - roles/hifis-net-ansible-role-unattended-upgrades
+  - roles/ansible-role-pip
+  - roles/ansible-role-bootstrap
+  - roles/ansible_role_ctop
+  - roles/ansible-role-docker
+  - roles/ansible-role-helm
+  - roles/ansible-role-nfs
+  - roles/ansible-role-unattended-upgrades
   - roles/mrlesmithjr-ansible-manage-lvm
-  - roles/oefenweb-ansible-ufw
-  - roles/pandemonium1986-ansible-role-k9s
+  - roles/ansible-ufw
   - roles/pyratlabs-ansible-role-gitea
   - roles/ansible-role-postgresql
diff --git a/.gitignore b/.gitignore
index 594a39f2..48e82e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,16 +2,16 @@
 vault-pass.yml
 id_ed25519
 id_ed25519.pub
-roles/geerlingguy-ansible-role-pip
+roles/ansible-role-pip
 roles/pyratlabs-ansible-role-k3s
-roles/robertdebock-ansible-role-bootstrap
-roles/gantsign-ansible-role-ctop
-roles/geerlingguy-ansible-role-docker
-roles/geerlingguy-ansible-role-helm
-roles/geerlingguy-ansible-role-nfs
-roles/hifis-net-ansible-role-unattended-upgrades
+roles/ansible-role-bootstrap
+roles/ansible_role_ctop
+roles/ansible-role-docker
+roles/ansible-role-helm
+roles/ansible-role-nfs
+roles/ansible-role-unattended-upgrades
 roles/mrlesmithjr-ansible-manage-lvm
-roles/oefenweb-ansible-ufw
+roles/ansible-ufw
 roles/pandemonium1986-ansible-role-k9s
 roles/pyratlabs-ansible-role-gitea
 collections/
diff --git a/playbooks/1_bootstrap.yml b/playbooks/1_bootstrap.yml
index 9d3558b2..040d8c64 100644
--- a/playbooks/1_bootstrap.yml
+++ b/playbooks/1_bootstrap.yml
@@ -2,7 +2,7 @@
 - hosts: all
   gather_facts: false
   roles:
-    - role: robertdebock-ansible-role-bootstrap
+    - role: ansible-role-bootstrap
       tags: "bootstrap"
       become: true
     - role: mgrote_apt_manage_sources
diff --git a/playbooks/3_service/ansible.yml b/playbooks/3_service/ansible.yml
index 36f3bba3..a94990e6 100644
--- a/playbooks/3_service/ansible.yml
+++ b/playbooks/3_service/ansible.yml
@@ -1,4 +1,4 @@
 ---
 - hosts: ansible
   roles:
-    - { role: geerlingguy-ansible-role-pip, tags: "pip", become: true }
+    - { role: ansible-role-pip, tags: "pip", become: true }
diff --git a/playbooks/3_service/docker.yml b/playbooks/3_service/docker.yml
index faa04d25..c43814fd 100644
--- a/playbooks/3_service/docker.yml
+++ b/playbooks/3_service/docker.yml
@@ -3,8 +3,8 @@
   roles:
     - { role: mgrote_systemd_resolved, tags: "dns", become: true }
     - { role: mgrote_mount_cifs, tags: "cifs", become: true }
-    - { role: geerlingguy-ansible-role-pip, tags: "pip", become: true }
-    - { role: geerlingguy-ansible-role-docker, tags: "docker", become: true }
-    - { role: gantsign-ansible-role-ctop, tags: "ctop", become: true }
+    - { role: ansible-role-pip, tags: "pip", become: true }
+    - { role: ansible-role-docker, tags: "docker", become: true }
+    - { role: ansible_role_ctop, tags: "ctop", become: true }
     - { role: mgrote_set_permissions, tags: "perm", become: true }
     - { role: mgrote_docker_compose_inline, tags: "compose", become: true }
diff --git a/playbooks/base/packages.yml b/playbooks/base/packages.yml
index 0a5293d6..41a17806 100644
--- a/playbooks/base/packages.yml
+++ b/playbooks/base/packages.yml
@@ -10,7 +10,7 @@
       tags: "snapd"
     - role: mgrote_apt_update_packages
       tags: "updates"
-    - role: hifis-net-ansible-role-unattended-upgrades
+    - role: ansible-role-unattended-upgrades
       become: true
       tags: unattended
       when: "ansible_facts['distribution'] == 'Ubuntu'"
diff --git a/playbooks/base/ufw.yml b/playbooks/base/ufw.yml
index afc5bcf5..fc1340b5 100644
--- a/playbooks/base/ufw.yml
+++ b/playbooks/base/ufw.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: all:!pve:!pbs
   roles:
-    - { role: oefenweb-ansible-ufw, # Regeln werden in den Group/Host-Vars gesetzt
+    - { role: ansible-ufw, # Regeln werden in den Group/Host-Vars gesetzt
         tags: "ufw",
         become: true}