diff --git a/.ansible/skeleton/default/defaults/main.yml.j2 b/.ansible/skeleton/default/defaults/main.yml.j2 index 1544002..7a5d6c1 100644 --- a/.ansible/skeleton/default/defaults/main.yml.j2 +++ b/.ansible/skeleton/default/defaults/main.yml.j2 @@ -3,7 +3,7 @@ # Infrastructure # Ansible instructions to deploy the infrastructure -# Copyright (C) 2021 Saibotk +# Copyright (C) 2022 Saibotk # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/.ansible/skeleton/default/handlers/main.yml.j2 b/.ansible/skeleton/default/handlers/main.yml.j2 index 27e89a3..8ceff16 100644 --- a/.ansible/skeleton/default/handlers/main.yml.j2 +++ b/.ansible/skeleton/default/handlers/main.yml.j2 @@ -3,7 +3,7 @@ # Infrastructure # Ansible instructions to deploy the infrastructure -# Copyright (C) 2021 Saibotk +# Copyright (C) 2022 Saibotk # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/.ansible/skeleton/default/meta/main.yml.j2 b/.ansible/skeleton/default/meta/main.yml.j2 index 9167b81..234bc9d 100644 --- a/.ansible/skeleton/default/meta/main.yml.j2 +++ b/.ansible/skeleton/default/meta/main.yml.j2 @@ -1,13 +1,41 @@ galaxy_info: author: saibotk - description: Setup {{ role_name }}. + description: "Setup {{ role_name }}." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] diff --git a/.ansible/skeleton/default/tasks/main.yml.j2 b/.ansible/skeleton/default/tasks/main.yml.j2 index 252501b..3f61607 100644 --- a/.ansible/skeleton/default/tasks/main.yml.j2 +++ b/.ansible/skeleton/default/tasks/main.yml.j2 @@ -3,7 +3,7 @@ # Infrastructure # Ansible instructions to deploy the infrastructure -# Copyright (C) 2021 Saibotk +# Copyright (C) 2022 Saibotk # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/playbooks/camo.yml b/playbooks/camo.yml index 6a1b77b..d4bae81 100644 --- a/playbooks/camo.yml +++ b/playbooks/camo.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: camo +- name: Install & configure camo + hosts: camo roles: - docker - docker_compose diff --git a/playbooks/codimd.yml b/playbooks/codimd.yml index c142953..dede866 100644 --- a/playbooks/codimd.yml +++ b/playbooks/codimd.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: codimd +- name: Install & configure HedgeDoc + hosts: codimd roles: - docker - docker_compose diff --git a/playbooks/docker_ipv6_nat.yml b/playbooks/docker_ipv6_nat.yml index 812130e..bcd5e58 100644 --- a/playbooks/docker_ipv6_nat.yml +++ b/playbooks/docker_ipv6_nat.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: docker_ipv6_nat +- name: Install & configure Docker IPv6 NAT + hosts: docker_ipv6_nat roles: - docker - docker_compose diff --git a/playbooks/factorio.yml b/playbooks/factorio.yml index a44854f..01a8c04 100644 --- a/playbooks/factorio.yml +++ b/playbooks/factorio.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: factorio +- name: Install & configure Factorio + hosts: factorio roles: - docker - docker_compose diff --git a/playbooks/gitlab.yml b/playbooks/gitlab.yml index 506c185..a0270eb 100644 --- a/playbooks/gitlab.yml +++ b/playbooks/gitlab.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: gitlab +- name: Install & configure GitLab + hosts: gitlab roles: - docker - docker_compose diff --git a/playbooks/gitlab_runner.yml b/playbooks/gitlab_runner.yml index 045f8f6..ac54ec7 100644 --- a/playbooks/gitlab_runner.yml +++ b/playbooks/gitlab_runner.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: gitlab_runner +- name: Install & configure GitLab Runner + hosts: gitlab_runner roles: - docker - docker_compose diff --git a/playbooks/keycloak.yml b/playbooks/keycloak.yml index 54173d3..3586979 100644 --- a/playbooks/keycloak.yml +++ b/playbooks/keycloak.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: keycloak +- name: Install & configure Keycloak + hosts: keycloak roles: - docker - docker_compose diff --git a/playbooks/luks_ssh.yml b/playbooks/luks_ssh.yml index ae1125d..a617489 100644 --- a/playbooks/luks_ssh.yml +++ b/playbooks/luks_ssh.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: luks_ssh +- name: Install & configure LUKS SSH setup + hosts: luks_ssh roles: - haveged - luks_ssh diff --git a/playbooks/lvm_self_backup.yml b/playbooks/lvm_self_backup.yml index ccff1bb..157eb01 100644 --- a/playbooks/lvm_self_backup.yml +++ b/playbooks/lvm_self_backup.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: lvm_self_backup +- name: Install & configure LVM self backup + hosts: lvm_self_backup roles: - docker - lvm_self_backup diff --git a/playbooks/mailcow.yml b/playbooks/mailcow.yml index ffade8e..b7f02a7 100644 --- a/playbooks/mailcow.yml +++ b/playbooks/mailcow.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: mailcow +- name: Install & configure Docker & backup cronjob + hosts: mailcow roles: - docker - docker_compose diff --git a/playbooks/mastodon.yml b/playbooks/mastodon.yml index 8309390..1d9e011 100644 --- a/playbooks/mastodon.yml +++ b/playbooks/mastodon.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: mastodon +- name: Install & configure Mastodon + hosts: mastodon roles: - docker - docker_compose diff --git a/playbooks/matrix.yml b/playbooks/matrix.yml index 4c72692..2e011bd 100644 --- a/playbooks/matrix.yml +++ b/playbooks/matrix.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: matrix +- name: Install & configure Matrix + hosts: matrix roles: - docker - docker_compose diff --git a/playbooks/matrix_delegate.yml b/playbooks/matrix_delegate.yml index b1fa2e4..539ceed 100644 --- a/playbooks/matrix_delegate.yml +++ b/playbooks/matrix_delegate.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: matrix_delegate +- name: Install & configure Matrix Delegate + hosts: matrix_delegate roles: - docker - docker_compose diff --git a/playbooks/matrix_elementweb.yml b/playbooks/matrix_elementweb.yml index aa7fef4..5500235 100644 --- a/playbooks/matrix_elementweb.yml +++ b/playbooks/matrix_elementweb.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: matrix_elementweb +- name: Install & configure Element Web + hosts: matrix_elementweb roles: - docker - docker_compose diff --git a/playbooks/matrix_maubot.yml b/playbooks/matrix_maubot.yml index cd33b70..8e23de6 100644 --- a/playbooks/matrix_maubot.yml +++ b/playbooks/matrix_maubot.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: matrix_maubot +- name: Install & configure Mauboot + hosts: matrix_maubot roles: - docker - docker_compose diff --git a/playbooks/matrix_webhooks.yml b/playbooks/matrix_webhooks.yml index 86e1e58..3f9cd8c 100644 --- a/playbooks/matrix_webhooks.yml +++ b/playbooks/matrix_webhooks.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: matrix_webhooks +- name: Install & configure Matrix Webhooks + hosts: matrix_webhooks roles: - docker - docker_compose diff --git a/playbooks/minecraft.yml b/playbooks/minecraft.yml index e5879b5..6e60aa8 100644 --- a/playbooks/minecraft.yml +++ b/playbooks/minecraft.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: minecraft +- name: Install & configure Minecraft + hosts: minecraft roles: - docker - docker_compose diff --git a/playbooks/minecraft_blockmap.yml b/playbooks/minecraft_blockmap.yml index d89cfe9..22484c0 100644 --- a/playbooks/minecraft_blockmap.yml +++ b/playbooks/minecraft_blockmap.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: minecraft +- name: Install & configure BlockMap + hosts: minecraft roles: - docker - docker_compose diff --git a/playbooks/minio.yml b/playbooks/minio.yml index 41ad12a..ce41e8d 100644 --- a/playbooks/minio.yml +++ b/playbooks/minio.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: minio +- name: Install & configure MinIO + hosts: minio roles: - docker - docker_compose diff --git a/playbooks/monitoring.yml b/playbooks/monitoring.yml index ef7485d..f53cd7f 100644 --- a/playbooks/monitoring.yml +++ b/playbooks/monitoring.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: monitoring +- name: Install & configure monitoring servers + hosts: monitoring roles: - docker - docker_compose @@ -27,7 +28,8 @@ environment: PYTHONPATH: /opt/ansible-dependencies/lib/python{{ env_ansible_deps_python_version | default(2.7) }}/site-packages -- hosts: all +- name: Install & configure monitoring clients + hosts: all serial: 1 roles: - docker diff --git a/playbooks/owncast.yml b/playbooks/owncast.yml index 03b03cc..f5241a9 100644 --- a/playbooks/owncast.yml +++ b/playbooks/owncast.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: owncast +- name: Install & configure Owncast + hosts: owncast roles: - docker - docker_compose diff --git a/playbooks/penpot.yml b/playbooks/penpot.yml index 408cceb..ca29812 100644 --- a/playbooks/penpot.yml +++ b/playbooks/penpot.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: penpot +- name: Install & configure Penpot + hosts: penpot roles: - docker - docker_compose diff --git a/playbooks/site.yml b/playbooks/site.yml index 50cd718..a50da75 100644 --- a/playbooks/site.yml +++ b/playbooks/site.yml @@ -17,24 +17,45 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- import_playbook: docker_ipv6_nat.yml -- import_playbook: lvm_self_backup.yml -- import_playbook: gitlab.yml -- import_playbook: gitlab_runner.yml -- import_playbook: camo.yml -- import_playbook: keycloak.yml -- import_playbook: monitoring.yml -- import_playbook: minio.yml -- import_playbook: mastodon.yml -- import_playbook: codimd.yml -- import_playbook: matrix.yml -- import_playbook: matrix_delegate.yml -- import_playbook: matrix_elementweb.yml -- import_playbook: matrix_webhooks.yml -- import_playbook: matrix_maubot.yml -- import_playbook: static_websites.yml -- import_playbook: teamspeak.yml -- import_playbook: owncast.yml -- import_playbook: factorio.yml -- import_playbook: penpot.yml -- import_playbook: vikunja.yml +- name: Install & configure ipv6 NAT for Docker + import_playbook: docker_ipv6_nat.yml +- name: Install & configure backup solution using LVM + import_playbook: lvm_self_backup.yml +- name: Install & configure GitLab + import_playbook: gitlab.yml +- name: Install & configure GitLab Runner + import_playbook: gitlab_runner.yml +- name: Install & configure camo + import_playbook: camo.yml +- name: Install & configure Keycloak + import_playbook: keycloak.yml +- name: Install & configure monitoring + import_playbook: monitoring.yml +- name: Install & configure MinIO + import_playbook: minio.yml +- name: Install & configure Mastodon + import_playbook: mastodon.yml +- name: Install & configure HedgeDoc + import_playbook: codimd.yml +- name: Install & configure Matrix + import_playbook: matrix.yml +- name: Install & configure Matrix Delegate + import_playbook: matrix_delegate.yml +- name: Install & configure Element Web + import_playbook: matrix_elementweb.yml +- name: Install & configure Matrix Webhooks + import_playbook: matrix_webhooks.yml +- name: Install & configure Maubot + import_playbook: matrix_maubot.yml +- name: Install & configure static websites + import_playbook: static_websites.yml +- name: Install & configure Teamspeak + import_playbook: teamspeak.yml +- name: Install & configure Owncast + import_playbook: owncast.yml +- name: Install & configure Factorio + import_playbook: factorio.yml +- name: Install & configure Penpot + import_playbook: penpot.yml +- name: Install & configure Vikunja + import_playbook: vikunja.yml diff --git a/playbooks/ssh.yml b/playbooks/ssh.yml index 2602890..589829b 100644 --- a/playbooks/ssh.yml +++ b/playbooks/ssh.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: ssh +- name: Configure SSH + hosts: ssh collections: - devsec.hardening roles: diff --git a/playbooks/static_websites.yml b/playbooks/static_websites.yml index 5bee581..2e4ab93 100644 --- a/playbooks/static_websites.yml +++ b/playbooks/static_websites.yml @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: static_websites +- name: Install & configure static websites + hosts: static_websites serial: 1 roles: - docker diff --git a/playbooks/sys_upgrade.yml b/playbooks/sys_upgrade.yml index a762c4f..bdbd8ae 100644 --- a/playbooks/sys_upgrade.yml +++ b/playbooks/sys_upgrade.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: all +- name: Install latest updates to all packages on hosts + hosts: all roles: - sys_upgrade environment: diff --git a/playbooks/teamspeak.yml b/playbooks/teamspeak.yml index 04e077b..5830df4 100644 --- a/playbooks/teamspeak.yml +++ b/playbooks/teamspeak.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: teamspeak +- name: Install & configure Teamspeak + hosts: teamspeak roles: - docker - docker_compose diff --git a/playbooks/vikunja.yml b/playbooks/vikunja.yml index 7b46e31..3f8ea18 100644 --- a/playbooks/vikunja.yml +++ b/playbooks/vikunja.yml @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- hosts: vikunja +- name: Install & configure Vikunja + hosts: vikunja roles: - docker - docker_compose diff --git a/requirements.yml b/requirements.yml index 60e33c3..10582ee 100644 --- a/requirements.yml +++ b/requirements.yml @@ -8,3 +8,5 @@ collections: version: 3.2.0 - name: ansible.posix version: 1.4.0 + - name: ansible.utils + version: 2.6.1 diff --git a/roles/camo/defaults/main.yml b/roles/camo/defaults/main.yml index 107ef1d..5710f38 100644 --- a/roles/camo/defaults/main.yml +++ b/roles/camo/defaults/main.yml @@ -32,7 +32,7 @@ camo_domain: camo.example.com camo_traefik_certresolver: "letsencrypt_http" # The HMAC key to be used -camo_key: "{{ lookup('passwordstore', camo_domain + '/hmac-key create=true length=128') }}" +camo_key: "{{ lookup('passwordstore', camo_domain + '/hmac-key create=true length=128') }}" # The maximum allowed response size (in KB). (0 means unlimited) camo_max_size: 0 diff --git a/roles/camo/meta/main.yml b/roles/camo/meta/main.yml index 547f6bc..90e0cd8 100644 --- a/roles/camo/meta/main.yml +++ b/roles/camo/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Installs a go-camo image proxy server. + description: "Installs a go-camo image proxy server via Docker." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/codimd/meta/main.yml b/roles/codimd/meta/main.yml index fe733e0..826292b 100644 --- a/roles/codimd/meta/main.yml +++ b/roles/codimd/meta/main.yml @@ -1,16 +1,45 @@ galaxy_info: author: saibotk - description: Installs HedgeDoc as a docker container + description: "Installs HedgeDoc as a Docker container." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true + platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/docker/meta/main.yml b/roles/docker/meta/main.yml index f2227e4..e88668f 100644 --- a/roles/docker/meta/main.yml +++ b/roles/docker/meta/main.yml @@ -1,16 +1,23 @@ galaxy_info: author: saibotk - description: Installs docker package from their official repository and installs the docker python package via pip. + description: "Installs Docker package from their official repository and installs the docker python package via pip." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: Fedora + versions: + - all - name: Ubuntu versions: - - 20.04 + - all + - name: Debian + versions: + - all galaxy_tags: [] diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 1f6eb95..f1580b7 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -18,8 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" - include_tasks: "{{ distro_file }}" +- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" # noqa name[template] + ansible.builtin.include_tasks: "{{ distro_file }}" with_first_found: - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" - "{{ ansible_distribution }}.yml" diff --git a/roles/docker_cleanup/meta/main.yml b/roles/docker_cleanup/meta/main.yml index b0ff83f..71fcc64 100644 --- a/roles/docker_cleanup/meta/main.yml +++ b/roles/docker_cleanup/meta/main.yml @@ -1,16 +1,43 @@ galaxy_info: author: Christoph Kern - description: Cleans up the exsting docker install + description: "Cleans up the exsting Docker install" license: GPL-3.0-only - - min_ansible_version: 2.4 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker + - role: docker diff --git a/roles/docker_compose/meta/main.yml b/roles/docker_compose/meta/main.yml index 9574af7..3dac3dd 100644 --- a/roles/docker_compose/meta/main.yml +++ b/roles/docker_compose/meta/main.yml @@ -1,16 +1,20 @@ galaxy_info: author: saibotk - description: Installs the docker-compose pip package. + description: "Installs the docker-compose pip package." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - "7" - name: Ubuntu versions: - - 20.04 + - all + - name: Debian + versions: + - all galaxy_tags: [] diff --git a/roles/docker_compose/tasks/main.yml b/roles/docker_compose/tasks/main.yml index 6b34b9a..410d6e6 100644 --- a/roles/docker_compose/tasks/main.yml +++ b/roles/docker_compose/tasks/main.yml @@ -23,8 +23,8 @@ state: "{{ docker_compose_package_state }}" become: true -- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" - include_tasks: "{{ distro_file }}" +- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" # noqa name[template] + ansible.builtin.include_tasks: "{{ distro_file }}" with_first_found: - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" - "{{ ansible_distribution }}.yml" diff --git a/roles/docker_ipv6_nat/meta/main.yml b/roles/docker_ipv6_nat/meta/main.yml index 46ff2d3..7aa58fb 100644 --- a/roles/docker_ipv6_nat/meta/main.yml +++ b/roles/docker_ipv6_nat/meta/main.yml @@ -1,16 +1,44 @@ galaxy_info: author: saibotk - description: Deploys a robbertkl/ipv6nat container. + description: "Deploys a robbertkl/ipv6nat container." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose + - role: docker + - role: docker_compose diff --git a/roles/epel/meta/main.yml b/roles/epel/meta/main.yml index 5f2bf47..fba54e3 100644 --- a/roles/epel/meta/main.yml +++ b/roles/epel/meta/main.yml @@ -2,12 +2,13 @@ galaxy_info: author: saibotk description: Installs the epel-release package. license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - "7" galaxy_tags: [] diff --git a/roles/factorio/meta/main.yml b/roles/factorio/meta/main.yml index c52aa51..7ad687a 100644 --- a/roles/factorio/meta/main.yml +++ b/roles/factorio/meta/main.yml @@ -1,16 +1,44 @@ galaxy_info: author: saibotk - description: Installs a factorio server. + description: "Installs a factorio server via Docker." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose + - role: docker + - role: docker_compose diff --git a/roles/fail2ban/handlers/main.yml b/roles/fail2ban/handlers/main.yml index aca4b58..87df9f5 100644 --- a/roles/fail2ban/handlers/main.yml +++ b/roles/fail2ban/handlers/main.yml @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- name: restart fail2ban service +- name: Restart fail2ban service ansible.builtin.systemd: name: "fail2ban" state: "restarted" diff --git a/roles/fail2ban/meta/main.yml b/roles/fail2ban/meta/main.yml index 47e71ea..2822c79 100644 --- a/roles/fail2ban/meta/main.yml +++ b/roles/fail2ban/meta/main.yml @@ -1,16 +1,42 @@ galaxy_info: author: saibotk - description: Installs and configures fail2ban. + description: "Installs and configures fail2ban." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all - name: Ubuntu versions: - - 20.04 + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all + galaxy_tags: [] dependencies: [] diff --git a/roles/fail2ban/tasks/main.yml b/roles/fail2ban/tasks/main.yml index 2f505cb..4826beb 100644 --- a/roles/fail2ban/tasks/main.yml +++ b/roles/fail2ban/tasks/main.yml @@ -48,7 +48,7 @@ mode: '0644' owner: 'root' group: 'root' - notify: restart fail2ban service + notify: Restart fail2ban service become: true - name: Deploy fail2ban config. @@ -58,7 +58,7 @@ mode: '0644' owner: 'root' group: 'root' - notify: restart fail2ban service + notify: Restart fail2ban service become: true - name: Deploy fail2ban hardening systemd drop-in. @@ -68,7 +68,7 @@ mode: '0644' owner: 'root' group: 'root' - notify: restart fail2ban service + notify: Restart fail2ban service become: true - name: Flush handlers diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml index 128c71a..294f74b 100644 --- a/roles/gitlab/defaults/main.yml +++ b/roles/gitlab/defaults/main.yml @@ -60,7 +60,7 @@ gitlab_selinux_enabled: true gitlab_smtp_address: smtp.example.com gitlab_smtp_port: 465 gitlab_smtp_user_name: 'gitlab@example.com' -gitlab_smtp_password: "{{ lookup('passwordstore', gitlab_domain + '/' + gitlab_smtp_user_name + ' create=true length=42') }}" +gitlab_smtp_password: "{{ lookup('passwordstore', gitlab_domain + '/' + gitlab_smtp_user_name + ' create=true length=42') }}" gitlab_smtp_tls: "{{ gitlab_snmp_tls | default('true') }}" # There was a typo in the config option name, this makes sure it's falling back properly gitlab_email_from: "{{ gitlab_smtp_user_name }}" gitlab_email_reply_to: "{{ gitlab_smtp_user_name }}" diff --git a/roles/gitlab/meta/main.yml b/roles/gitlab/meta/main.yml index 1042c4d..8c91e09 100644 --- a/roles/gitlab/meta/main.yml +++ b/roles/gitlab/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Installs and configures gitlab via docker. + description: "Installs and configures GitLab via Docker." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/gitlab_runner/meta/main.yml b/roles/gitlab_runner/meta/main.yml index 39b4ae1..75a35d3 100644 --- a/roles/gitlab_runner/meta/main.yml +++ b/roles/gitlab_runner/meta/main.yml @@ -1,16 +1,44 @@ galaxy_info: author: saibotk - description: Deploys a gitlab-runner using Docker. + description: "Deploys a gitlab-runner using Docker." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose + - role: docker + - role: docker_compose diff --git a/roles/haveged/meta/main.yml b/roles/haveged/meta/main.yml index fd0f4cf..10bacb5 100644 --- a/roles/haveged/meta/main.yml +++ b/roles/haveged/meta/main.yml @@ -1,15 +1,25 @@ galaxy_info: author: saibotk - description: Installs the haveged package and starts the systemd service. + description: "Installs the haveged package and starts the systemd service." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: Fedora + versions: + - all + - name: Ubuntu + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - epel + - role: epel diff --git a/roles/keycloak/defaults/main.yml b/roles/keycloak/defaults/main.yml index bae4ed0..9098ba1 100644 --- a/roles/keycloak/defaults/main.yml +++ b/roles/keycloak/defaults/main.yml @@ -49,7 +49,7 @@ keycloak_domain: keycloak.example.com # The database credentials. keycloak_database_user: "keycloak" -keycloak_database_password: "{{ lookup('passwordstore', keycloak_domain + '/database' + ' create=true') }}" +keycloak_database_password: "{{ lookup('passwordstore', keycloak_domain + '/database' + ' create=true') }}" # The default welcome theme keycloak will use keycloak_theme_welcome: "{{ omit }}" diff --git a/roles/keycloak/meta/main.yml b/roles/keycloak/meta/main.yml index 36508c5..2e8cf42 100644 --- a/roles/keycloak/meta/main.yml +++ b/roles/keycloak/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Installs Keycloak via the official container and traefik. + description: "Installs Keycloak via the official container and traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/luks_ssh/meta/main.yml b/roles/luks_ssh/meta/main.yml index 5450305..9b19f55 100644 --- a/roles/luks_ssh/meta/main.yml +++ b/roles/luks_ssh/meta/main.yml @@ -2,12 +2,13 @@ galaxy_info: author: saibotk description: Installs openssh to initramfs with dracut, to unlock LUKS encrypted root partition on boot. license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - "7" galaxy_tags: [] diff --git a/roles/lvm_self_backup/meta/main.yml b/roles/lvm_self_backup/meta/main.yml index 1fd2d37..a9c6d53 100644 --- a/roles/lvm_self_backup/meta/main.yml +++ b/roles/lvm_self_backup/meta/main.yml @@ -1,15 +1,43 @@ galaxy_info: author: saibotk - description: Deploys a self backup solution using lvm and duplicity. + description: "Deploys a self backup solution using lvm and duplicity." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker + - role: docker diff --git a/roles/mastodon/meta/main.yml b/roles/mastodon/meta/main.yml index d250c9c..fc28898 100644 --- a/roles/mastodon/meta/main.yml +++ b/roles/mastodon/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys a mastodon server via docker using traefik. + description: "Deploys a mastodon server via docker using traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml index 07a840e..d3c4444 100644 --- a/roles/mastodon/tasks/main.yml +++ b/roles/mastodon/tasks/main.yml @@ -111,7 +111,7 @@ become: true - name: Migrate database - ansible.builtin.command: docker-compose run --rm web rails db:migrate + ansible.builtin.command: "docker-compose run --rm web rails db:migrate" args: chdir: "{{ mastodon_install_location }}" when: @@ -122,7 +122,7 @@ - mastodon become: true environment: - PYTHONPATH: + PYTHONPATH: "" - name: Clear cache ansible.builtin.command: docker-compose run --rm web bin/tootctl cache clear @@ -136,7 +136,7 @@ - mastodon become: true environment: - PYTHONPATH: + PYTHONPATH: "" - name: Compose mastodon community.docker.docker_compose: diff --git a/roles/matrix/defaults/main.yml b/roles/matrix/defaults/main.yml index e2bf920..9e583e9 100644 --- a/roles/matrix/defaults/main.yml +++ b/roles/matrix/defaults/main.yml @@ -39,7 +39,7 @@ matrix_synapse_domain: "{{ matrix_synapse_servername }}" matrix_synapse_options: {} # The database password to use -matrix_database_password: "{{ lookup('passwordstore', matrix_synapse_domain + '/db create=true length=42') }}" +matrix_database_password: "{{ lookup('passwordstore', matrix_synapse_domain + '/db create=true length=42') }}" # Container versions # renovate: depName=docker.io/matrixdotorg/synapse diff --git a/roles/matrix/meta/main.yml b/roles/matrix/meta/main.yml index 8841827..9f58f67 100644 --- a/roles/matrix/meta/main.yml +++ b/roles/matrix/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys a matrix server via docker using traefik. + description: "Deploys a matrix server via docker using traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/matrix_delegate/handlers/main.yml b/roles/matrix_delegate/handlers/main.yml index 92d91c8..e03d224 100644 --- a/roles/matrix_delegate/handlers/main.yml +++ b/roles/matrix_delegate/handlers/main.yml @@ -18,7 +18,7 @@ # along with this program. If not, see . # -- name: restart matrix delegate nginx +- name: Restart matrix delegate nginx community.docker.docker_compose: services: - delegate diff --git a/roles/matrix_delegate/meta/main.yml b/roles/matrix_delegate/meta/main.yml index 8fb26e9..38ec852 100644 --- a/roles/matrix_delegate/meta/main.yml +++ b/roles/matrix_delegate/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys a matrix delegate server via docker using traefik. + description: "Deploys a matrix delegate server via docker using traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/matrix_delegate/tasks/main.yml b/roles/matrix_delegate/tasks/main.yml index 0bd14a6..622a446 100644 --- a/roles/matrix_delegate/tasks/main.yml +++ b/roles/matrix_delegate/tasks/main.yml @@ -73,7 +73,7 @@ - docker - matrix - delegate - notify: restart matrix delegate nginx + notify: Restart matrix delegate nginx become: true - name: Compose matrix_delegate diff --git a/roles/matrix_elementweb/handlers/main.yml b/roles/matrix_elementweb/handlers/main.yml index 6eaac27..ade5a9e 100644 --- a/roles/matrix_elementweb/handlers/main.yml +++ b/roles/matrix_elementweb/handlers/main.yml @@ -18,7 +18,7 @@ # along with this program. If not, see . # -- name: restart matrix elementweb +- name: Restart matrix elementweb community.docker.docker_compose: services: - elementweb diff --git a/roles/matrix_elementweb/meta/main.yml b/roles/matrix_elementweb/meta/main.yml index 9dee890..6ef7345 100644 --- a/roles/matrix_elementweb/meta/main.yml +++ b/roles/matrix_elementweb/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys a elementweb server via docker using traefik. + description: "Deploys a elementweb server via docker using traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/matrix_elementweb/tasks/main.yml b/roles/matrix_elementweb/tasks/main.yml index 2e1dc44..d5a2aca 100644 --- a/roles/matrix_elementweb/tasks/main.yml +++ b/roles/matrix_elementweb/tasks/main.yml @@ -78,7 +78,7 @@ - docker - matrix - elementweb - notify: restart matrix elementweb + notify: Restart matrix elementweb become: true - name: Compose matrix-elementweb diff --git a/roles/matrix_maubot/defaults/main.yml b/roles/matrix_maubot/defaults/main.yml index d490cad..dc7c761 100644 --- a/roles/matrix_maubot/defaults/main.yml +++ b/roles/matrix_maubot/defaults/main.yml @@ -32,7 +32,7 @@ matrix_maubot_traefik_certresolver: letsencrypt_http matrix_maubot_domain: "maubot.example.com" # The database password to use -matrix_maubot_database_password: "{{ lookup('passwordstore', matrix_maubot_domain + '/db create=true length=42') }}" +matrix_maubot_database_password: "{{ lookup('passwordstore', matrix_maubot_domain + '/db create=true length=42') }}" # Container versions # renovate: depName=dock.mau.dev/maubot/maubot diff --git a/roles/matrix_maubot/meta/main.yml b/roles/matrix_maubot/meta/main.yml index 95d4c47..22d94a7 100644 --- a/roles/matrix_maubot/meta/main.yml +++ b/roles/matrix_maubot/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys a matrix maubot server via docker using traefik. + description: "Deploys a matrix maubot server via docker using traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/matrix_webhooks/defaults/main.yml b/roles/matrix_webhooks/defaults/main.yml index 5665201..ed5ab8e 100644 --- a/roles/matrix_webhooks/defaults/main.yml +++ b/roles/matrix_webhooks/defaults/main.yml @@ -41,7 +41,7 @@ matrix_webhooks_hs_servername: "example.com" matrix_webhooks_image_version: "latest" # The Provision API key -matrix_webhooks_provisioning_key: "{{ lookup('passwordstore', matrix_webhooks_domain + '/provisioning-api create=true length=42') }}" +matrix_webhooks_provisioning_key: "{{ lookup('passwordstore', matrix_webhooks_domain + '/provisioning-api create=true length=42') }}" # Webhook user profile (seems to be unused at the moment) matrix_webhooks_display_name: "Captain Webhook" diff --git a/roles/matrix_webhooks/handlers/main.yml b/roles/matrix_webhooks/handlers/main.yml index e4ee293..51450b1 100644 --- a/roles/matrix_webhooks/handlers/main.yml +++ b/roles/matrix_webhooks/handlers/main.yml @@ -18,7 +18,7 @@ # along with this program. If not, see . # -- name: restart matrix webhooks +- name: Restart matrix webhooks community.docker.docker_compose: services: - appservice-webhooks diff --git a/roles/matrix_webhooks/meta/main.yml b/roles/matrix_webhooks/meta/main.yml index c2f1a51..53eaec6 100644 --- a/roles/matrix_webhooks/meta/main.yml +++ b/roles/matrix_webhooks/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys a matrix webhook appservice server via docker using traefik. + description: "Deploys a matrix webhook appservice server via docker using traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/matrix_webhooks/tasks/main.yml b/roles/matrix_webhooks/tasks/main.yml index 2e5dcb7..e3ef76d 100644 --- a/roles/matrix_webhooks/tasks/main.yml +++ b/roles/matrix_webhooks/tasks/main.yml @@ -77,7 +77,7 @@ - docker - matrix - webhooks - notify: restart matrix webhooks + notify: Restart matrix webhooks become: true - name: Generate webhooks registration diff --git a/roles/minecraft/meta/main.yml b/roles/minecraft/meta/main.yml index a6ea1f3..1f06b24 100644 --- a/roles/minecraft/meta/main.yml +++ b/roles/minecraft/meta/main.yml @@ -1,16 +1,44 @@ galaxy_info: author: saibotk - description: Deploys a minecraft server with docker and an optional RCON webinterface. + description: "Deploys a minecraft server with docker and an optional RCON webinterface." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose + - role: docker + - role: docker_compose diff --git a/roles/minecraft_blockmap/meta/main.yml b/roles/minecraft_blockmap/meta/main.yml index ac8cd38..28d0d27 100644 --- a/roles/minecraft_blockmap/meta/main.yml +++ b/roles/minecraft_blockmap/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys a minecraft-blockmap renderer and makes the result available using nginx and traefik. + description: "Deploys a minecraft-blockmap renderer and makes the result available using nginx and traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/minio/meta/main.yml b/roles/minio/meta/main.yml index 5c45eb0..0ae35cf 100644 --- a/roles/minio/meta/main.yml +++ b/roles/minio/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Installs and manages minio instances for S3 compatible storage. + description: "Installs and manages minio instances for S3 compatible storage." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/moby_engine/meta/main.yml b/roles/moby_engine/meta/main.yml index 43868e6..e34f473 100644 --- a/roles/moby_engine/meta/main.yml +++ b/roles/moby_engine/meta/main.yml @@ -1,13 +1,14 @@ galaxy_info: author: saibotk - description: Installs moby-engine. + description: "Installs moby-engine." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - name: Fedora versions: - - 32 + - all galaxy_tags: [] diff --git a/roles/moby_engine/tasks/main.yml b/roles/moby_engine/tasks/main.yml index 74b57c0..ea1ed4d 100644 --- a/roles/moby_engine/tasks/main.yml +++ b/roles/moby_engine/tasks/main.yml @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" - include_tasks: "{{ distro_file }}" +- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" # noqa name[template] + ansible.builtin.include_tasks: "{{ distro_file }}" with_first_found: - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" - "{{ ansible_distribution }}.yml" diff --git a/roles/monitoring/defaults/main.yml b/roles/monitoring/defaults/main.yml index bad6247..5922ed4 100644 --- a/roles/monitoring/defaults/main.yml +++ b/roles/monitoring/defaults/main.yml @@ -65,7 +65,7 @@ monitoring_grafana_feature_toggles: [] # The influxdb admin credentials that should be created monitoring_influxdb_admin_username: "admin" -monitoring_influxdb_admin_password: "{{ lookup('passwordstore', monitoring_influxdb_domain + '/db-admin create=true length=42') }}" +monitoring_influxdb_admin_password: "{{ lookup('passwordstore', monitoring_influxdb_domain + '/db-admin create=true length=42') }}" # The influxdb databases that should be created and their policies monitoring_influxdb_databases: @@ -82,7 +82,7 @@ monitoring_influxdb_databases: # Other influxdb users, that should be created monitoring_influxdb_users: - username: "telegraf" - password: "{{ lookup('passwordstore', monitoring_influxdb_domain + '/db create=true length=42') }}" + password: "{{ lookup('passwordstore', monitoring_influxdb_domain + '/db create=true length=42') }}" grants: - database: "telegraf" privilege: "ALL" diff --git a/roles/monitoring/meta/main.yml b/roles/monitoring/meta/main.yml index 2ee3fcd..52fcb1d 100644 --- a/roles/monitoring/meta/main.yml +++ b/roles/monitoring/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys an influxdb and grafana via docker and traefik. + description: "Deploys an influxdb and grafana via docker and traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/monitoring/tasks/influxdb/main.yml b/roles/monitoring/tasks/influxdb/main.yml index e90d328..998e32b 100644 --- a/roles/monitoring/tasks/influxdb/main.yml +++ b/roles/monitoring/tasks/influxdb/main.yml @@ -33,7 +33,7 @@ no_log: true - name: Configure databases - include_tasks: database.yml + ansible.builtin.include_tasks: database.yml loop: "{{ monitoring_influxdb_databases }}" loop_control: loop_var: "database" diff --git a/roles/monitoring/tasks/main.yml b/roles/monitoring/tasks/main.yml index 793c332..a927799 100644 --- a/roles/monitoring/tasks/main.yml +++ b/roles/monitoring/tasks/main.yml @@ -89,4 +89,4 @@ when: monitoring_compose is changed - name: Include influxdb management - include_tasks: influxdb/main.yml + ansible.builtin.include_tasks: influxdb/main.yml diff --git a/roles/owncast/handlers/main.yml b/roles/owncast/handlers/main.yml index 2d5413b..5fcf501 100644 --- a/roles/owncast/handlers/main.yml +++ b/roles/owncast/handlers/main.yml @@ -18,7 +18,7 @@ # along with this program. If not, see . # -- name: restart owncast +- name: Restart owncast community.docker.docker_compose: services: - owncast diff --git a/roles/owncast/meta/main.yml b/roles/owncast/meta/main.yml index 6dfbbc4..616deb1 100644 --- a/roles/owncast/meta/main.yml +++ b/roles/owncast/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys an owncast server. + description: "Deploys an owncast server." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/owncast/tasks/main.yml b/roles/owncast/tasks/main.yml index 2f356aa..7adb3d1 100644 --- a/roles/owncast/tasks/main.yml +++ b/roles/owncast/tasks/main.yml @@ -61,7 +61,7 @@ owner: 'root' group: 'root' setype: "container_file_t" - notify: restart owncast + notify: Restart owncast become: true - name: Deploy docker-compose.yml diff --git a/roles/penpot/defaults/main.yml b/roles/penpot/defaults/main.yml index 9f569ae..968c7cd 100644 --- a/roles/penpot/defaults/main.yml +++ b/roles/penpot/defaults/main.yml @@ -44,7 +44,7 @@ penpot_domain: design.example.com penpot_traefik_certresolver: letsencrypt_http # The database credentials -penpot_database_password: "{{ lookup('passwordstore', penpot_domain + '/db create=true length=42') }}" +penpot_database_password: "{{ lookup('passwordstore', penpot_domain + '/db create=true length=42') }}" # Should the registration be enabled? penpot_registration_enabled: false diff --git a/roles/penpot/meta/main.yml b/roles/penpot/meta/main.yml index 4b5e0ed..4a66cd8 100644 --- a/roles/penpot/meta/main.yml +++ b/roles/penpot/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Setup a penpot docker container with traefik. + description: "Setup a penpot docker container with traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/ssh/meta/main.yml b/roles/ssh/meta/main.yml index 6f431d7..1f0bd41 100644 --- a/roles/ssh/meta/main.yml +++ b/roles/ssh/meta/main.yml @@ -1,13 +1,41 @@ galaxy_info: author: saibotk - description: Installs ssh keys for users and creates them if necessary. + description: "Installs ssh keys for users and creates them if necessary." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: Centos + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] diff --git a/roles/static_websites/meta/main.yml b/roles/static_websites/meta/main.yml index c5fc392..465b8b6 100644 --- a/roles/static_websites/meta/main.yml +++ b/roles/static_websites/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Deploys static website containers with traefik. + description: "Deploys static website containers with traefik." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik diff --git a/roles/sys_upgrade/meta/main.yml b/roles/sys_upgrade/meta/main.yml index ec75e89..e7c2eb1 100644 --- a/roles/sys_upgrade/meta/main.yml +++ b/roles/sys_upgrade/meta/main.yml @@ -1,14 +1,14 @@ galaxy_info: author: Christoph Kern - description: Upgrades System so latest packages are installed + description: "Upgrades System so latest packages are installed" # If the issue tracker for your role is not on github, uncomment the # next line and provide a value issue_tracker_url: https://github.com/SISheogorath/ansible-client/issues license: GPL-3.0-only - - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true # # platforms is a list of platforms, and each platform has a name and a list of versions. @@ -17,9 +17,9 @@ galaxy_info: - name: Fedora versions: - all - - name: CentOS + - name: EL versions: - - 7 + - "7" - name: Debian versions: - all diff --git a/roles/sys_upgrade/tasks/Debian.yml b/roles/sys_upgrade/tasks/Debian.yml index c7ac378..a66bcb1 100644 --- a/roles/sys_upgrade/tasks/Debian.yml +++ b/roles/sys_upgrade/tasks/Debian.yml @@ -31,7 +31,7 @@ - name: Upgrade all packages ansible.builtin.apt: name: "*" - state: latest # noqa 403 + state: latest # noqa package-latest update_cache: true tags: - apt diff --git a/roles/sys_upgrade/tasks/Fedora.yml b/roles/sys_upgrade/tasks/Fedora.yml index a033922..33378c7 100644 --- a/roles/sys_upgrade/tasks/Fedora.yml +++ b/roles/sys_upgrade/tasks/Fedora.yml @@ -21,7 +21,7 @@ - name: Upgrade all packages ansible.builtin.dnf: name: "*" - state: latest # noqa 403 + state: latest # noqa package-latest update_cache: true tags: - dnf diff --git a/roles/sys_upgrade/tasks/RedHat.yml b/roles/sys_upgrade/tasks/RedHat.yml index e09f3f2..8e6a7a3 100644 --- a/roles/sys_upgrade/tasks/RedHat.yml +++ b/roles/sys_upgrade/tasks/RedHat.yml @@ -21,7 +21,7 @@ - name: Upgrade all packages (RedHat-common) ansible.builtin.yum: name: "*" - state: latest # noqa 403 + state: latest # noqa package-latest update_cache: true tags: - yum diff --git a/roles/sys_upgrade/tasks/main.yml b/roles/sys_upgrade/tasks/main.yml index 2f5ec0c..f902659 100644 --- a/roles/sys_upgrade/tasks/main.yml +++ b/roles/sys_upgrade/tasks/main.yml @@ -18,7 +18,7 @@ # along with this program. If not, see . # -- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" +- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" # noqa name[template] ansible.builtin.include_tasks: "{{ distro_file }}" with_first_found: - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" diff --git a/roles/teamspeak/meta/main.yml b/roles/teamspeak/meta/main.yml index d2e3252..ea7f08e 100644 --- a/roles/teamspeak/meta/main.yml +++ b/roles/teamspeak/meta/main.yml @@ -1,16 +1,44 @@ galaxy_info: author: saibotk - description: Deploys a teamspeak 3 server via docker. + description: "Deploys a teamspeak 3 server via docker." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose + - role: docker + - role: docker_compose diff --git a/roles/telegraf/defaults/main.yml b/roles/telegraf/defaults/main.yml index c7aa19e..0841ba4 100644 --- a/roles/telegraf/defaults/main.yml +++ b/roles/telegraf/defaults/main.yml @@ -42,7 +42,7 @@ telegraf_influxdb_endpoints: # The influxdb credentials telegraf_influxdb_username: telegraf -telegraf_influxdb_password: "{{ lookup('passwordstore', telegraf_influxdb_endpoints[0] + '/db create=true length=42') }}" +telegraf_influxdb_password: "{{ lookup('passwordstore', telegraf_influxdb_endpoints[0] + '/db create=true length=42') }}" # The retention policy settings (see https://github.com/influxdata/telegraf/blob/release-1.15/plugins/outputs/influxdb/README.md) telegraf_influxdb_retention_policy: "" diff --git a/roles/telegraf/meta/main.yml b/roles/telegraf/meta/main.yml index 4d7db9c..b33e9b9 100644 --- a/roles/telegraf/meta/main.yml +++ b/roles/telegraf/meta/main.yml @@ -1,16 +1,44 @@ galaxy_info: author: saibotk - description: Deploys a telegraf container for monitoring. + description: "Deploys a telegraf container for monitoring." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose + - role: docker + - role: docker_compose diff --git a/roles/traefik/meta/main.yml b/roles/traefik/meta/main.yml index 0d0f8b4..209f692 100644 --- a/roles/traefik/meta/main.yml +++ b/roles/traefik/meta/main.yml @@ -1,16 +1,44 @@ galaxy_info: author: saibotk - description: Installs traefik via docker with optional tor access and acmedumper. + description: "Installs traefik via docker with optional tor access and acmedumper." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose + - role: docker + - role: docker_compose diff --git a/roles/traefik/tasks/main.yml b/roles/traefik/tasks/main.yml index 52b5bdd..dde0ef5 100644 --- a/roles/traefik/tasks/main.yml +++ b/roles/traefik/tasks/main.yml @@ -58,11 +58,11 @@ become: true - name: Include configs for Tor - include_tasks: tor.yml + ansible.builtin.include_tasks: tor.yml when: traefik_tor_enabled | bool - name: Include configs for acme-dumper - include_tasks: acmedumper.yml + ansible.builtin.include_tasks: acmedumper.yml when: traefik_acmedumper_enabled | bool - name: Create proxy network @@ -171,7 +171,7 @@ - -p - tcp - --destination - - "{{ traefik_ipv6.ip_addr | ipaddr('address') }}/128" + - "{{ traefik_ipv6.ip_addr | default('2001:db8::') | ansible.utils.ipaddr('address') }}/128" - --dport - "{{ item }}" - -j @@ -205,7 +205,7 @@ - -p - tcp - --destination - - "{{ traefik_ipv6.ip_addr | ipaddr('address') }}/128" + - "{{ traefik_ipv6.ip_addr | default('2001:db8::') | ansible.utils.ipaddr('address') }}/128" - --dport - "{{ item }}" - -j diff --git a/roles/vikunja/defaults/main.yml b/roles/vikunja/defaults/main.yml index c556581..261c08d 100644 --- a/roles/vikunja/defaults/main.yml +++ b/roles/vikunja/defaults/main.yml @@ -39,7 +39,7 @@ vikunja_api_traefik_certresolver: letsencrypt_http vikunja_api_domain: "{{ vikunja_frontend_domain }}" # The database password to use -vikunja_database_password: "{{ lookup('passwordstore', vikunja_api_domain + '/db create=true length=42') }}" +vikunja_database_password: "{{ lookup('passwordstore', vikunja_api_domain + '/db create=true length=42') }}" # Container versions # renovate: depName=docker.io/vikunja/api diff --git a/roles/vikunja/meta/main.yml b/roles/vikunja/meta/main.yml index 1d9fe85..da9a5ce 100644 --- a/roles/vikunja/meta/main.yml +++ b/roles/vikunja/meta/main.yml @@ -1,17 +1,45 @@ galaxy_info: author: saibotk - description: Installs vikunja via docker. + description: "Installs vikunja via docker." license: GPL-3.0-only - min_ansible_version: 2.9 + min_ansible_version: "2.9" + standalone: true platforms: - - name: CentOS + - name: EL versions: - - 7 + - all + - name: GenericUNIX + versions: + - all + - name: Fedora + versions: + - all + - name: opensuse + versions: + - all + - name: GenericBSD + versions: + - all + - name: FreeBSD + versions: + - all + - name: Ubuntu + versions: + - all + - name: SLES + versions: + - all + - name: GenericLinux + versions: + - all + - name: Debian + versions: + - all galaxy_tags: [] dependencies: - - docker - - docker_compose - - traefik + - role: docker + - role: docker_compose + - role: traefik