From b7586644774db2e8cfd51bfcfe00fd24d2ef05a7 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 16 Sep 2024 12:03:10 +0200 Subject: [PATCH] fdf --- .ansible-lint | 11 ----------- .gitignore | 20 ++++++++++---------- friedhof/ansible_vars.yml | 2 +- group_vars/docker.yml | 2 +- group_vars/git.yml | 2 +- playbooks/3_service/docker.yml | 6 +++--- playbooks/3_service/git.yml | 2 +- playbooks/3_service/lldap.yml | 2 +- playbooks/base/packages.yml | 2 +- playbooks/base/system.yml | 2 +- playbooks/base/ufw.yml | 2 +- 11 files changed, 21 insertions(+), 32 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index b4c2cf06..7a234318 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -14,15 +14,4 @@ exclude_paths: - playbooks/base - playbooks/3_service - playbooks/1_bootstrap.yml - - 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/ansible-manage-lvm - - roles/ansible-ufw - - roles/ansible_role_gitea - - roles/ansible-role-postgresql - .gitea/ diff --git a/.gitignore b/.gitignore index c9297a1e..b2f7616f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,19 +2,19 @@ vault-pass id_ed25519 id_ed25519.pub -roles/ansible-role-pip +roles/geerlingguy.pip roles/ansible-role-k3s roles/ansible-role-bootstrap -roles/ansible_role_ctop -roles/ansible-role-docker +roles/gantsign.ctop +roles/geerlingguy.docker roles/ansible-role-helm -roles/ansible-role-nfs -roles/ansible_role_gitea -roles/ansible-role-unattended-upgrades -roles/ansible-manage-lvm -roles/ansible-ufw +roles/geerlingguy.nfs +roles/roles-ansible.gitea +roles/hifis.unattended-upgrades +roles/mrlesmithjr.manage_lvm +roles/oefenweb.ufw roles/pandemonium1986-ansible-role-k9s -roles/ansible_role_gitea +roles/roles-ansible.gitea collections/ plugins/lookup/__pycache__/ -roles/ansible-role-postgresql +roles/geerlingguy.postgresql diff --git a/friedhof/ansible_vars.yml b/friedhof/ansible_vars.yml index e7aebf82..3f8b77ce 100644 --- a/friedhof/ansible_vars.yml +++ b/friedhof/ansible_vars.yml @@ -1,6 +1,6 @@ --- - hosts: ansible roles: - - role: ansible-role-pip + - role: geerlingguy.pip tags: "pip" become: true diff --git a/group_vars/docker.yml b/group_vars/docker.yml index f6a17f65..b0ebe4e6 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -1,5 +1,5 @@ --- -### mrlesmithjr.ansible-manage-lvm +### mrlesmithjr.manage_lvm lvm_groups: - vgname: vg_docker disks: diff --git a/group_vars/git.yml b/group_vars/git.yml index bb87c9c9..c665b37b 100644 --- a/group_vars/git.yml +++ b/group_vars/git.yml @@ -52,7 +52,7 @@ ufw_rules: comment: 'gitea' from_ip: 0.0.0.0/0 -### ansible_role_gitea +### roles-ansible.gitea gitea_fork: "forgejo" # gitea update gitea_version: "8.0.0" # TODO renovate, wird das erkannt? diff --git a/playbooks/3_service/docker.yml b/playbooks/3_service/docker.yml index 696a38fe..05c423ec 100644 --- a/playbooks/3_service/docker.yml +++ b/playbooks/3_service/docker.yml @@ -4,13 +4,13 @@ - role: mgrote_systemd_resolved tags: "dns" become: true - - role: ansible-role-pip + - role: geerlingguy.pip tags: "pip" become: true - - role: ansible-role-docker + - role: geerlingguy.docker tags: "docker" become: true - - role: ansible_role_ctop + - role: gantsign.ctop tags: "ctop" become: true - role: mgrote_set_permissions diff --git a/playbooks/3_service/git.yml b/playbooks/3_service/git.yml index b04fa2ff..eab2d213 100644 --- a/playbooks/3_service/git.yml +++ b/playbooks/3_service/git.yml @@ -1,7 +1,7 @@ --- - hosts: git roles: - - role: ansible-role-postgresql + - role: geerlingguy.postgresql tags: "db" become: true - role: ansible_role_gitea diff --git a/playbooks/3_service/lldap.yml b/playbooks/3_service/lldap.yml index 2c0325bb..adc2829b 100644 --- a/playbooks/3_service/lldap.yml +++ b/playbooks/3_service/lldap.yml @@ -1,7 +1,7 @@ --- - hosts: ldap roles: - - role: ansible-role-postgresql + - role: geerlingguy.postgresql tags: "db" become: true - role: mgrote_lldap diff --git a/playbooks/base/packages.yml b/playbooks/base/packages.yml index 657bcd05..f8daaf1d 100644 --- a/playbooks/base/packages.yml +++ b/playbooks/base/packages.yml @@ -10,6 +10,6 @@ tags: "snapd" - role: mgrote_apt_update_packages tags: "updates" - - role: ansible-role-unattended-upgrades + - role: hifis.unattended-upgrades become: true tags: unattended diff --git a/playbooks/base/system.yml b/playbooks/base/system.yml index cb4e54ed..f5cc995d 100644 --- a/playbooks/base/system.yml +++ b/playbooks/base/system.yml @@ -15,7 +15,7 @@ become: true tags: fwupd when: "ansible_facts['distribution'] == 'Ubuntu'" - - role: ansible-manage-lvm + - role: mrlesmithjr.manage_lvm tags: "lvm" become: true when: manage_lvm == true and manage_lvm is defined diff --git a/playbooks/base/ufw.yml b/playbooks/base/ufw.yml index 0afd9435..a77c4238 100644 --- a/playbooks/base/ufw.yml +++ b/playbooks/base/ufw.yml @@ -1,6 +1,6 @@ --- - hosts: all:!pve:!pbs roles: - - role: ansible-ufw # Regeln werden in den Group/Host-Vars gesetzt + - role: oefenweb.ufw # Regeln werden in den Group/Host-Vars gesetzt tags: ufw become: true