From 6c7ecfc724315eac2c6ab3310628809029a5e462 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 8 Aug 2026 23:50:32 -0500 Subject: [PATCH] Add fail2ban role and clean up yaml lint noise --- collections/requirements.yml | 52 ++- roles/ensure_ansible_prereq/.travis.yml | 11 +- roles/ensure_ansible_prereq/defaults/main.yml | 2 +- roles/ensure_ansible_prereq/handlers/main.yml | 12 +- roles/ensure_ansible_prereq/meta/main.yml | 5 +- .../tasks/Debian-default.yml | 8 +- roles/ensure_ansible_prereq/tasks/default.yml | 2 +- roles/ensure_ansible_prereq/tasks/main.yml | 78 ++-- roles/ensure_ansible_prereq/tests/test.yml | 3 +- roles/ensure_ansible_prereq/vars/default.yml | 2 +- roles/ensure_ansible_prereq/vars/main.yml | 2 +- roles/ensure_apache/.travis.yml | 11 +- roles/ensure_apache/defaults/main.yml | 4 +- roles/ensure_apache/handlers/main.yml | 12 +- roles/ensure_apache/meta/main.yml | 5 +- roles/ensure_apache/tasks/main.yml | 141 ++++--- roles/ensure_apache/tests/test.yml | 3 +- .../ensure_apache/vars/Fedora-42-default.yml | 388 +++++++++-------- .../ensure_apache/vars/Fedora-43-default.yml | 388 +++++++++-------- .../ensure_apache/vars/Fedora-44-default.yml | 397 ++++++++++-------- roles/ensure_apache/vars/default.yml | 2 +- roles/ensure_apache/vars/main.yml | 2 +- roles/ensure_cockpit/.travis.yml | 11 +- roles/ensure_cockpit/defaults/main.yml | 2 +- roles/ensure_cockpit/handlers/main.yml | 12 +- roles/ensure_cockpit/meta/main.yml | 5 +- roles/ensure_cockpit/tasks/main.yml | 58 ++- roles/ensure_cockpit/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 38 +- .../vars/AlmaLinux-9-default.yml | 38 +- .../ensure_cockpit/vars/CentOS-10-default.yml | 38 +- .../ensure_cockpit/vars/CentOS-9-default.yml | 38 +- .../ensure_cockpit/vars/Debian-11-default.yml | 38 +- .../ensure_cockpit/vars/Debian-12-default.yml | 42 +- .../ensure_cockpit/vars/Debian-13-default.yml | 42 +- .../ensure_cockpit/vars/Fedora-42-default.yml | 50 ++- .../ensure_cockpit/vars/Fedora-43-default.yml | 50 ++- .../ensure_cockpit/vars/Fedora-44-default.yml | 50 ++- .../vars/OracleLinux-10-default.yml | 38 +- .../vars/OracleLinux-9-default.yml | 38 +- .../ensure_cockpit/vars/Rocky-10-default.yml | 38 +- roles/ensure_cockpit/vars/Rocky-9-default.yml | 38 +- .../ensure_cockpit/vars/Ubuntu-22-default.yml | 42 +- .../ensure_cockpit/vars/Ubuntu-24-default.yml | 42 +- .../ensure_cockpit/vars/Ubuntu-26-default.yml | 42 +- roles/ensure_cockpit/vars/default.yml | 2 +- roles/ensure_cockpit/vars/main.yml | 2 +- roles/ensure_dovecot/.travis.yml | 11 +- roles/ensure_dovecot/defaults/main.yml | 2 +- roles/ensure_dovecot/handlers/main.yml | 12 +- roles/ensure_dovecot/meta/main.yml | 5 +- roles/ensure_dovecot/tasks/main.yml | 92 ++-- roles/ensure_dovecot/tests/test.yml | 3 +- .../ensure_dovecot/vars/Fedora-42-default.yml | 207 +++++---- .../ensure_dovecot/vars/Fedora-43-default.yml | 67 +-- .../ensure_dovecot/vars/Fedora-44-default.yml | 66 +-- roles/ensure_dovecot/vars/default.yml | 2 +- roles/ensure_dovecot/vars/main.yml | 2 +- roles/ensure_fail2ban/handlers/main.yml | 14 + roles/ensure_fail2ban/meta/main.yml | 3 + roles/ensure_fail2ban/tasks/main.yml | 130 ++++++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../fail2ban/jail.d/99-custom_jails.conf.j2 | 37 ++ .../vars/Debian-11-default.yml | 16 + .../vars/Debian-12-default.yml | 16 + .../vars/Debian-13-default.yml | 16 + .../vars/Fedora-43-default.yml | 16 + .../vars/Fedora-44-default.yml | 16 + .../vars/Ubuntu-22-default.yml | 16 + .../vars/Ubuntu-24-default.yml | 16 + .../vars/Ubuntu-26-default.yml | 16 + roles/ensure_fail2ban/vars/default.yml | 2 + roles/ensure_fail2ban/vars/main.yml | 2 + roles/ensure_git/.travis.yml | 11 +- roles/ensure_git/defaults/main.yml | 3 +- roles/ensure_git/handlers/main.yml | 12 +- roles/ensure_git/meta/main.yml | 5 +- roles/ensure_git/tasks/main.yml | 82 ++-- roles/ensure_git/tests/test.yml | 3 +- .../ensure_git/vars/AlmaLinux-10-default.yml | 6 +- roles/ensure_git/vars/AlmaLinux-9-default.yml | 6 +- roles/ensure_git/vars/CentOS-10-default.yml | 6 +- roles/ensure_git/vars/CentOS-9-default.yml | 6 +- roles/ensure_git/vars/Debian-11-default.yml | 6 +- roles/ensure_git/vars/Debian-12-default.yml | 6 +- roles/ensure_git/vars/Debian-13-default.yml | 6 +- roles/ensure_git/vars/Fedora-42-default.yml | 6 +- roles/ensure_git/vars/Fedora-43-default.yml | 6 +- roles/ensure_git/vars/Fedora-44-default.yml | 6 +- .../vars/OracleLinux-10-default.yml | 6 +- .../ensure_git/vars/OracleLinux-9-default.yml | 6 +- roles/ensure_git/vars/Rocky-10-default.yml | 6 +- roles/ensure_git/vars/Rocky-9-default.yml | 6 +- roles/ensure_git/vars/Ubuntu-22-default.yml | 6 +- roles/ensure_git/vars/Ubuntu-24-default.yml | 6 +- roles/ensure_git/vars/Ubuntu-26-default.yml | 6 +- roles/ensure_git/vars/default.yml | 2 +- roles/ensure_git/vars/main.yml | 2 +- roles/ensure_gitea/defaults/main.yml | 11 +- roles/ensure_gitea/handlers/main.yml | 11 +- roles/ensure_gitea/meta/main.yml | 5 +- roles/ensure_gitea/tasks/main.yml | 106 ++--- roles/ensure_gitea/tests/test.yml | 3 +- roles/ensure_gitea/vars/Fedora-42-default.yml | 21 +- roles/ensure_gitea/vars/Fedora-43-default.yml | 21 +- roles/ensure_gitea/vars/Fedora-44-default.yml | 21 +- roles/ensure_gitea/vars/default.yml | 2 +- roles/ensure_gitea/vars/main.yml | 2 +- roles/ensure_hostname/defaults/main.yml | 2 +- roles/ensure_hostname/handlers/main.yml | 2 +- roles/ensure_hostname/meta/main.yml | 4 +- roles/ensure_hostname/tasks/main.yml | 4 +- roles/ensure_hostname/tests/test.yml | 3 +- roles/ensure_hostname/vars/main.yml | 2 +- roles/ensure_log_rotation/.travis.yml | 11 +- roles/ensure_log_rotation/handlers/main.yml | 12 +- roles/ensure_log_rotation/meta/main.yml | 5 +- roles/ensure_log_rotation/tasks/main.yml | 57 +-- roles/ensure_log_rotation/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 32 +- .../vars/AlmaLinux-9-default.yml | 32 +- .../vars/CentOS-10-default.yml | 32 +- .../vars/CentOS-9-default.yml | 32 +- .../vars/Fedora-42-default.yml | 36 +- .../vars/Fedora-43-default.yml | 36 +- .../vars/Fedora-44-default.yml | 36 +- .../vars/OracleLinux-10-default.yml | 32 +- .../vars/OracleLinux-9-default.yml | 32 +- .../vars/Rocky-10-default.yml | 32 +- .../vars/Rocky-9-default.yml | 32 +- roles/ensure_log_rotation/vars/default.yml | 2 +- roles/ensure_log_rotation/vars/main.yml | 2 +- roles/ensure_mariadb/.travis.yml | 11 +- roles/ensure_mariadb/handlers/main.yml | 11 +- roles/ensure_mariadb/meta/main.yml | 5 +- roles/ensure_mariadb/tasks/main.yml | 325 +++++++------- roles/ensure_mariadb/tests/test.yml | 3 +- .../ensure_mariadb/vars/Fedora-42-default.yml | 222 +++++----- .../ensure_mariadb/vars/Fedora-43-default.yml | 222 +++++----- .../ensure_mariadb/vars/Fedora-44-default.yml | 222 +++++----- roles/ensure_mariadb/vars/default.yml | 2 +- roles/ensure_mariadb/vars/main.yml | 2 +- roles/ensure_os_patch/.travis.yml | 11 +- roles/ensure_os_patch/defaults/main.yml | 2 +- roles/ensure_os_patch/handlers/main.yml | 12 +- roles/ensure_os_patch/meta/main.yml | 5 +- roles/ensure_os_patch/tasks/main.yml | 72 ++-- roles/ensure_os_patch/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 14 +- .../vars/AlmaLinux-9-default.yml | 14 +- .../vars/CentOS-10-default.yml | 14 +- .../ensure_os_patch/vars/CentOS-9-default.yml | 14 +- .../vars/Fedora-42-default.yml | 9 +- .../vars/Fedora-43-default.yml | 9 +- .../vars/Fedora-44-default.yml | 9 +- .../vars/OracleLinux-10-default.yml | 13 +- .../vars/OracleLinux-9-default.yml | 13 +- .../ensure_os_patch/vars/Rocky-10-default.yml | 13 +- .../ensure_os_patch/vars/Rocky-9-default.yml | 13 +- roles/ensure_os_patch/vars/default.yml | 2 +- roles/ensure_os_patch/vars/main.yml | 2 +- roles/ensure_os_upgrade/.travis.yml | 11 +- roles/ensure_os_upgrade/defaults/main.yml | 2 +- roles/ensure_os_upgrade/handlers/main.yml | 12 +- roles/ensure_os_upgrade/meta/main.yml | 5 +- roles/ensure_os_upgrade/tasks/main.yml | 63 +-- roles/ensure_os_upgrade/tests/test.yml | 3 +- .../vars/Fedora-42-default.yml | 6 +- roles/ensure_os_upgrade/vars/default.yml | 2 +- roles/ensure_os_upgrade/vars/main.yml | 2 +- roles/ensure_podman/.travis.yml | 11 +- roles/ensure_podman/defaults/main.yml | 2 +- roles/ensure_podman/handlers/main.yml | 12 +- roles/ensure_podman/meta/main.yml | 5 +- roles/ensure_podman/tasks/main.yml | 51 ++- roles/ensure_podman/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 12 +- .../vars/AlmaLinux-9-default.yml | 12 +- .../ensure_podman/vars/CentOS-10-default.yml | 12 +- roles/ensure_podman/vars/CentOS-9-default.yml | 12 +- .../ensure_podman/vars/Fedora-42-default.yml | 16 +- .../ensure_podman/vars/Fedora-43-default.yml | 16 +- .../ensure_podman/vars/Fedora-44-default.yml | 16 +- .../vars/OracleLinux-10-default.yml | 12 +- .../vars/OracleLinux-9-default.yml | 12 +- roles/ensure_podman/vars/Rocky-10-default.yml | 12 +- roles/ensure_podman/vars/Rocky-9-default.yml | 12 +- roles/ensure_podman/vars/default.yml | 2 +- roles/ensure_podman/vars/main.yml | 2 +- roles/ensure_postfix/.travis.yml | 11 +- roles/ensure_postfix/defaults/main.yml | 2 +- roles/ensure_postfix/handlers/main.yml | 12 +- roles/ensure_postfix/meta/main.yml | 5 +- roles/ensure_postfix/tasks/main.yml | 92 ++-- roles/ensure_postfix/tests/test.yml | 3 +- .../ensure_postfix/vars/Fedora-42-default.yml | 216 +++++----- .../ensure_postfix/vars/Fedora-43-default.yml | 216 +++++----- .../ensure_postfix/vars/Fedora-44-default.yml | 216 +++++----- roles/ensure_postfix/vars/default.yml | 2 +- roles/ensure_postfix/vars/main.yml | 2 +- roles/ensure_repo_epel/.travis.yml | 11 +- roles/ensure_repo_epel/defaults/main.yml | 2 +- roles/ensure_repo_epel/handlers/main.yml | 12 +- roles/ensure_repo_epel/meta/main.yml | 5 +- roles/ensure_repo_epel/tasks/main.yml | 48 +-- roles/ensure_repo_epel/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 7 +- .../vars/AlmaLinux-9-default.yml | 7 +- .../vars/CentOS-10-default.yml | 7 +- .../vars/CentOS-9-default.yml | 7 +- .../vars/OracleLinux-10-default.yml | 13 +- .../vars/OracleLinux-9-default.yml | 13 +- .../vars/Rocky-10-default.yml | 7 +- .../ensure_repo_epel/vars/Rocky-9-default.yml | 7 +- roles/ensure_repo_epel/vars/default.yml | 2 +- roles/ensure_repo_epel/vars/main.yml | 2 +- roles/ensure_repo_rpmfusion/.travis.yml | 11 +- roles/ensure_repo_rpmfusion/defaults/main.yml | 2 +- roles/ensure_repo_rpmfusion/handlers/main.yml | 12 +- roles/ensure_repo_rpmfusion/meta/main.yml | 5 +- roles/ensure_repo_rpmfusion/tasks/main.yml | 48 +-- roles/ensure_repo_rpmfusion/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 13 +- .../vars/AlmaLinux-9-default.yml | 13 +- .../vars/CentOS-10-default.yml | 13 +- .../vars/CentOS-9-default.yml | 13 +- .../vars/Fedora-42-default.yml | 12 +- .../vars/Fedora-43-default.yml | 12 +- .../vars/Fedora-44-default.yml | 12 +- .../vars/OracleLinux-10-default.yml | 13 +- .../vars/OracleLinux-9-default.yml | 13 +- .../vars/Rocky-10-default.yml | 13 +- .../vars/Rocky-9-default.yml | 13 +- roles/ensure_repo_rpmfusion/vars/default.yml | 2 +- roles/ensure_repo_rpmfusion/vars/main.yml | 2 +- roles/ensure_rsync/defaults/main.yml | 3 +- roles/ensure_rsync/handlers/main.yml | 12 +- roles/ensure_rsync/meta/main.yml | 5 +- roles/ensure_rsync/tasks/main.yml | 83 ++-- roles/ensure_rsync/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 6 +- .../ensure_rsync/vars/AlmaLinux-9-default.yml | 6 +- roles/ensure_rsync/vars/CentOS-10-default.yml | 6 +- roles/ensure_rsync/vars/CentOS-9-default.yml | 6 +- roles/ensure_rsync/vars/Debian-11-default.yml | 6 +- roles/ensure_rsync/vars/Debian-12-default.yml | 6 +- roles/ensure_rsync/vars/Debian-13-default.yml | 6 +- roles/ensure_rsync/vars/Fedora-42-default.yml | 6 +- roles/ensure_rsync/vars/Fedora-43-default.yml | 6 +- roles/ensure_rsync/vars/Fedora-44-default.yml | 6 +- .../vars/OracleLinux-10-default.yml | 6 +- .../vars/OracleLinux-9-default.yml | 6 +- roles/ensure_rsync/vars/Rocky-10-default.yml | 6 +- roles/ensure_rsync/vars/Rocky-9-default.yml | 6 +- roles/ensure_rsync/vars/Ubuntu-22-default.yml | 6 +- roles/ensure_rsync/vars/Ubuntu-24-default.yml | 6 +- roles/ensure_rsync/vars/Ubuntu-26-default.yml | 6 +- roles/ensure_rsync/vars/default.yml | 2 +- roles/ensure_rsync/vars/main.yml | 2 +- roles/ensure_selinux/.travis.yml | 11 +- roles/ensure_selinux/defaults/main.yml | 3 +- roles/ensure_selinux/handlers/main.yml | 12 +- roles/ensure_selinux/meta/main.yml | 5 +- roles/ensure_selinux/tasks/main.yml | 65 ++- roles/ensure_selinux/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 12 +- .../vars/AlmaLinux-9-default.yml | 12 +- .../ensure_selinux/vars/CentOS-10-default.yml | 12 +- .../ensure_selinux/vars/CentOS-9-default.yml | 12 +- .../ensure_selinux/vars/Fedora-42-default.yml | 12 +- .../ensure_selinux/vars/Fedora-43-default.yml | 12 +- .../ensure_selinux/vars/Fedora-44-default.yml | 12 +- .../vars/OracleLinux-10-default.yml | 12 +- .../vars/OracleLinux-9-default.yml | 12 +- .../ensure_selinux/vars/Rocky-10-default.yml | 12 +- roles/ensure_selinux/vars/Rocky-9-default.yml | 12 +- roles/ensure_selinux/vars/default.yml | 2 +- roles/ensure_selinux/vars/main.yml | 2 +- roles/ensure_sudo/.travis.yml | 11 +- roles/ensure_sudo/defaults/main.yml | 3 +- roles/ensure_sudo/handlers/main.yml | 12 +- roles/ensure_sudo/meta/main.yml | 5 +- roles/ensure_sudo/tasks/main.yml | 70 ++- roles/ensure_sudo/tests/test.yml | 3 +- .../ensure_sudo/vars/AlmaLinux-10-default.yml | 64 +-- .../ensure_sudo/vars/AlmaLinux-9-default.yml | 64 +-- roles/ensure_sudo/vars/CentOS-10-default.yml | 64 +-- roles/ensure_sudo/vars/CentOS-9-default.yml | 64 +-- roles/ensure_sudo/vars/Fedora-42-default.yml | 64 +-- roles/ensure_sudo/vars/Fedora-43-default.yml | 64 +-- roles/ensure_sudo/vars/Fedora-44-default.yml | 64 +-- .../vars/OracleLinux-10-default.yml | 64 +-- .../vars/OracleLinux-9-default.yml | 64 +-- roles/ensure_sudo/vars/Rocky-10-default.yml | 64 +-- roles/ensure_sudo/vars/Rocky-9-default.yml | 64 +-- roles/ensure_sudo/vars/default.yml | 2 +- roles/ensure_sudo/vars/main.yml | 2 +- roles/ensure_timezone/.travis.yml | 11 +- roles/ensure_timezone/defaults/main.yml | 5 +- roles/ensure_timezone/handlers/main.yml | 12 +- roles/ensure_timezone/meta/main.yml | 5 +- roles/ensure_timezone/tasks/main.yml | 73 ++-- roles/ensure_timezone/tests/test.yml | 3 +- .../vars/AlmaLinux-10-default.yml | 6 +- .../vars/AlmaLinux-9-default.yml | 6 +- .../vars/CentOS-10-default.yml | 6 +- .../ensure_timezone/vars/CentOS-9-default.yml | 6 +- .../vars/Debian-11-default.yml | 6 +- .../vars/Debian-12-default.yml | 6 +- .../vars/Debian-13-default.yml | 6 +- .../vars/Fedora-42-default.yml | 6 +- .../vars/Fedora-43-default.yml | 6 +- .../vars/Fedora-44-default.yml | 6 +- .../vars/OracleLinux-10-default.yml | 6 +- .../vars/OracleLinux-9-default.yml | 6 +- .../ensure_timezone/vars/Rocky-10-default.yml | 6 +- .../ensure_timezone/vars/Rocky-9-default.yml | 6 +- roles/ensure_timezone/vars/default.yml | 2 +- roles/ensure_timezone/vars/main.yml | 2 +- roles/ensure_vim/.travis.yml | 11 +- roles/ensure_vim/defaults/main.yml | 3 +- roles/ensure_vim/handlers/main.yml | 12 +- roles/ensure_vim/meta/main.yml | 5 +- roles/ensure_vim/tasks/main.yml | 81 ++-- roles/ensure_vim/tests/test.yml | 3 +- .../ensure_vim/vars/AlmaLinux-10-default.yml | 6 +- roles/ensure_vim/vars/AlmaLinux-9-default.yml | 6 +- roles/ensure_vim/vars/CentOS-10-default.yml | 6 +- roles/ensure_vim/vars/CentOS-9-default.yml | 6 +- roles/ensure_vim/vars/Debian-11-default.yml | 6 +- roles/ensure_vim/vars/Debian-12-default.yml | 6 +- roles/ensure_vim/vars/Debian-13-default.yml | 6 +- roles/ensure_vim/vars/Fedora-42-default.yml | 14 +- roles/ensure_vim/vars/Fedora-43-default.yml | 14 +- roles/ensure_vim/vars/Fedora-44-default.yml | 14 +- .../vars/OracleLinux-10-default.yml | 6 +- .../ensure_vim/vars/OracleLinux-9-default.yml | 6 +- roles/ensure_vim/vars/Rocky-10-default.yml | 6 +- roles/ensure_vim/vars/Rocky-9-default.yml | 6 +- roles/ensure_vim/vars/Ubuntu-22-default.yml | 6 +- roles/ensure_vim/vars/Ubuntu-24-default.yml | 6 +- roles/ensure_vim/vars/Ubuntu-26-default.yml | 6 +- roles/ensure_vim/vars/default.yml | 2 +- roles/ensure_vim/vars/main.yml | 2 +- roles/requirements.yml | 1 - test.yml | 85 ++-- 352 files changed, 4632 insertions(+), 4186 deletions(-) create mode 100644 roles/ensure_fail2ban/handlers/main.yml create mode 100644 roles/ensure_fail2ban/meta/main.yml create mode 100644 roles/ensure_fail2ban/tasks/main.yml create mode 100644 roles/ensure_fail2ban/templates/Debian/11/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/templates/Debian/12/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/templates/Debian/13/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/templates/Fedora/43/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/templates/Fedora/44/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/templates/Ubuntu/22/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/templates/Ubuntu/24/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/templates/Ubuntu/26/etc/fail2ban/jail.d/99-custom_jails.conf.j2 create mode 100644 roles/ensure_fail2ban/vars/Debian-11-default.yml create mode 100644 roles/ensure_fail2ban/vars/Debian-12-default.yml create mode 100644 roles/ensure_fail2ban/vars/Debian-13-default.yml create mode 100644 roles/ensure_fail2ban/vars/Fedora-43-default.yml create mode 100644 roles/ensure_fail2ban/vars/Fedora-44-default.yml create mode 100644 roles/ensure_fail2ban/vars/Ubuntu-22-default.yml create mode 100644 roles/ensure_fail2ban/vars/Ubuntu-24-default.yml create mode 100644 roles/ensure_fail2ban/vars/Ubuntu-26-default.yml create mode 100644 roles/ensure_fail2ban/vars/default.yml create mode 100644 roles/ensure_fail2ban/vars/main.yml diff --git a/collections/requirements.yml b/collections/requirements.yml index 8688782..bdd5253 100644 --- a/collections/requirements.yml +++ b/collections/requirements.yml @@ -1,29 +1,27 @@ --- collections: - - name: 'ansible.netcommon' - - name: 'ansible.mysql' - - name: 'ansible.posix' - - name: 'ansible.windows' - - name: 'awx.awx' - - name: 'community.crypto' - - name: 'community.digitalocean' - - name: 'community.dns' - - name: 'community.general' - - name: 'community.grafana' - - name: 'community.hashi_vault' - - name: 'community.libvirt' - - name: 'community.postgresql' - - name: 'community.proxysql' - - name: 'community.rabbitmq' - - name: 'community.windows' - - name: 'community.zabbix' - - name: 'containers.podman' - - name: 'grafana.grafana' - - name: 'gluster.gluster' - - name: 'kubernetes.core' - - name: 'kubevirt.core' - - name: 'openstack.cloud' - - name: 'microsoft.ad' - - name: 'microsoft.iis' -... - + - name: ansible.netcommon + - name: ansible.mysql + - name: ansible.posix + - name: ansible.windows + - name: awx.awx + - name: community.crypto + - name: community.digitalocean + - name: community.dns + - name: community.general + - name: community.grafana + - name: community.hashi_vault + - name: community.libvirt + - name: community.postgresql + - name: community.proxysql + - name: community.rabbitmq + - name: community.windows + - name: community.zabbix + - name: containers.podman + - name: grafana.grafana + - name: gluster.gluster + - name: kubernetes.core + - name: kubevirt.core + - name: openstack.cloud + - name: microsoft.ad + - name: microsoft.iis diff --git a/roles/ensure_ansible_prereq/.travis.yml b/roles/ensure_ansible_prereq/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_ansible_prereq/.travis.yml +++ b/roles/ensure_ansible_prereq/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_ansible_prereq/defaults/main.yml b/roles/ensure_ansible_prereq/defaults/main.yml index 3a6b64a..91da2a7 100644 --- a/roles/ensure_ansible_prereq/defaults/main.yml +++ b/roles/ensure_ansible_prereq/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_ansible_prereq \ No newline at end of file +... diff --git a/roles/ensure_ansible_prereq/handlers/main.yml b/roles/ensure_ansible_prereq/handlers/main.yml index 26e65d8..d5aeccb 100644 --- a/roles/ensure_ansible_prereq/handlers/main.yml +++ b/roles/ensure_ansible_prereq/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_ansible_prereq -- name: 'ensure_ansible_prereq.package_facts' +- name: ensure_ansible_prereq.package_facts ansible.builtin.package_facts: -- name: 'ensure_ansible_prereq.service_facts' +- name: ensure_ansible_prereq.service_facts ansible.builtin.service_facts: -- name: 'ensure_ansible_prereq.service_reload' +- name: ensure_ansible_prereq.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_ansible_prereq is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_ansible_prereq.service_restart' +- name: ensure_ansible_prereq.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_ansible_prereq is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_ansible_prereq.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_ansible_prereq/meta/main.yml b/roles/ensure_ansible_prereq/meta/main.yml index f0b047c..515df96 100644 --- a/roles/ensure_ansible_prereq/meta/main.yml +++ b/roles/ensure_ansible_prereq/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensure required pre-req are present for ansible management @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_ansible_prereq/tasks/Debian-default.yml b/roles/ensure_ansible_prereq/tasks/Debian-default.yml index 24d7d57..4e028cf 100644 --- a/roles/ensure_ansible_prereq/tasks/Debian-default.yml +++ b/roles/ensure_ansible_prereq/tasks/Debian-default.yml @@ -1,9 +1,7 @@ --- # tasks file for ensure_ansible_prereq -- name: 'repository changes' +- name: repository changes ansible.builtin.lineinfile: - path: '/etc/apt/sources.list' - state: 'absent' + path: /etc/apt/sources.list + state: absent regexp: 'deb cdrom:' -... - diff --git a/roles/ensure_ansible_prereq/tasks/default.yml b/roles/ensure_ansible_prereq/tasks/default.yml index cc5ea92..91da2a7 100644 --- a/roles/ensure_ansible_prereq/tasks/default.yml +++ b/roles/ensure_ansible_prereq/tasks/default.yml @@ -1,2 +1,2 @@ --- -# tasks file for ensure_ansible_prereq +... diff --git a/roles/ensure_ansible_prereq/tasks/main.yml b/roles/ensure_ansible_prereq/tasks/main.yml index 2afd312..45e2070 100644 --- a/roles/ensure_ansible_prereq/tasks/main.yml +++ b/roles/ensure_ansible_prereq/tasks/main.yml @@ -1,51 +1,56 @@ --- # tasks file for ensure_ansible_prereq -- name: 'include vendor / version specific tasks' - when: - - ansible_facts["system"] == 'Linux' +- name: include vendor / version specific tasks + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_tasks: file: '{{ lookup("first_found", findme) }}' vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - errors: 'ignore' -- name: 'include vendor / version specific variables' - when: - - ansible_facts["system"] == 'Linux' + - default.yml + errors: ignore +- name: include vendor / version specific variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_ansible_prereq' + name: ensure_ansible_prereq vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_ansible_prereq is defined @@ -58,9 +63,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_ansible_prereq.package_facts' - - 'ensure_ansible_prereq.service_facts' -- name: 'ensure configurations' + - ensure_ansible_prereq.package_facts + - ensure_ansible_prereq.service_facts +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_ansible_prereq is defined @@ -81,11 +86,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_ansible_prereq.package_facts' - - 'ensure_ansible_prereq.service_facts' - - 'ensure_ansible_prereq.service_reload' - - 'ensure_ansible_prereq.service_restart' -- name: 'ensure services' + - ensure_ansible_prereq.package_facts + - ensure_ansible_prereq.service_facts + - ensure_ansible_prereq.service_reload + - ensure_ansible_prereq.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_ansible_prereq is defined @@ -99,8 +104,7 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_ansible_prereq.package_facts' - - 'ensure_ansible_prereq.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... + - ensure_ansible_prereq.package_facts + - ensure_ansible_prereq.service_facts +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_ansible_prereq/tests/test.yml b/roles/ensure_ansible_prereq/tests/test.yml index 6494e8f..daa7e56 100644 --- a/roles/ensure_ansible_prereq/tests/test.yml +++ b/roles/ensure_ansible_prereq/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_ansible_prereq \ No newline at end of file + roles: [ensure_ansible_prereq] diff --git a/roles/ensure_ansible_prereq/vars/default.yml b/roles/ensure_ansible_prereq/vars/default.yml index ce82ad2..91da2a7 100644 --- a/roles/ensure_ansible_prereq/vars/default.yml +++ b/roles/ensure_ansible_prereq/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_ansible_prereq \ No newline at end of file +... diff --git a/roles/ensure_ansible_prereq/vars/main.yml b/roles/ensure_ansible_prereq/vars/main.yml index ce82ad2..91da2a7 100644 --- a/roles/ensure_ansible_prereq/vars/main.yml +++ b/roles/ensure_ansible_prereq/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_ansible_prereq \ No newline at end of file +... diff --git a/roles/ensure_apache/.travis.yml b/roles/ensure_apache/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_apache/.travis.yml +++ b/roles/ensure_apache/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_apache/defaults/main.yml b/roles/ensure_apache/defaults/main.yml index baf6991..d559906 100644 --- a/roles/ensure_apache/defaults/main.yml +++ b/roles/ensure_apache/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ensure_apache -lets_encrypt_admin: 'root@example.com' -lets_encrypt_url: 'https://acme-v02.api.letsencrypt.org/directory' +lets_encrypt_admin: root@example.com +lets_encrypt_url: https://acme-v02.api.letsencrypt.org/directory diff --git a/roles/ensure_apache/handlers/main.yml b/roles/ensure_apache/handlers/main.yml index dbac500..f74f007 100644 --- a/roles/ensure_apache/handlers/main.yml +++ b/roles/ensure_apache/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_apache -- name: 'ensure_apache.package_facts' +- name: ensure_apache.package_facts ansible.builtin.package_facts: -- name: 'ensure_apache.service_facts' +- name: ensure_apache.service_facts ansible.builtin.service_facts: -- name: 'ensure_apache.service_reload' +- name: ensure_apache.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_apache is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_apache.service_restart' +- name: ensure_apache.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_apache.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_apache/meta/main.yml b/roles/ensure_apache/meta/main.yml index 71a68a3..6fb025b 100644 --- a/roles/ensure_apache/meta/main.yml +++ b/roles/ensure_apache/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensure Apache is installed, running, and functional @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - diff --git a/roles/ensure_apache/tasks/main.yml b/roles/ensure_apache/tasks/main.yml index 4bc1a23..97feddf 100644 --- a/roles/ensure_apache/tasks/main.yml +++ b/roles/ensure_apache/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_apache -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_apache' + name: ensure_apache vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure sysctl' +- name: ensure sysctl when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -46,11 +48,11 @@ loop_control: label: '{{ item.name }} will be {{ item.value }}' notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure packages' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -63,11 +65,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure seboolean' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -81,11 +83,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure configurations' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - http_vhost is defined @@ -107,11 +109,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure firewall' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure firewall when: - ansible_facts["system"] == 'Linux' - ansible_facts.packages["firewalld"] is defined @@ -127,11 +129,11 @@ loop_control: label: '{{ item.service }} will be {{ item.state }}' notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure permissions' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure permissions when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -158,11 +160,11 @@ loop_control: label: '{{ item.path }} will be ensured' notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure vhost document roots' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure vhost document roots when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -170,21 +172,21 @@ - http_vhost is iterable - item.fqdn is defined ansible.builtin.file: - path: '/srv/http/{{ item.fqdn }}' - state: 'directory' - owner: 'root' - group: 'root' + path: /srv/http/{{ item.fqdn }} + state: directory + owner: root + group: root mode: '0755' - setype: 'httpd_sys_content_t' + setype: httpd_sys_content_t loop: '{{ http_vhost }}' loop_control: - label: '/srv/http/{{ item.fqdn }} will be ensured' + label: /srv/http/{{ item.fqdn }} will be ensured notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure website content from git repos' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure website content from git repos when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -194,17 +196,17 @@ - item.repo is defined ansible.builtin.git: accept_hostkey: 'yes' - dest: '/srv/http/{{ item.fqdn }}' + dest: /srv/http/{{ item.fqdn }} repo: '{{ item.repo }}' loop: '{{ http_vhost }}' loop_control: - label: '/srv/http/{{ item.fqdn }} will be populated...' + label: /srv/http/{{ item.fqdn }} will be populated... notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'ensure services' + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_apache is defined @@ -218,10 +220,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_apache.package_facts' - - 'ensure_apache.service_facts' - - 'ensure_apache.service_reload' - - 'ensure_apache.service_restart' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... + - ensure_apache.package_facts + - ensure_apache.service_facts + - ensure_apache.service_reload + - ensure_apache.service_restart +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_apache/tests/test.yml b/roles/ensure_apache/tests/test.yml index 62b43ee..9433341 100644 --- a/roles/ensure_apache/tests/test.yml +++ b/roles/ensure_apache/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_apache \ No newline at end of file + roles: [ensure_apache] diff --git a/roles/ensure_apache/vars/Fedora-42-default.yml b/roles/ensure_apache/vars/Fedora-42-default.yml index d4e42c1..08cfae1 100644 --- a/roles/ensure_apache/vars/Fedora-42-default.yml +++ b/roles/ensure_apache/vars/Fedora-42-default.yml @@ -1,229 +1,259 @@ --- # vars file for ensure_apache package_list: - - name: 'httpd' - state: 'present' - - name: 'httpd-filesystem' - state: 'present' - - name: 'httpd-tools' - state: 'present' - - name: 'mod_http2' - state: 'present' - - name: 'mod_md' - state: 'present' - - name: 'mod_ssl' - state: 'present' - - name: 'php' - state: 'present' - - name: 'php-cli' - state: 'present' - - name: 'php-common' - state: 'present' - - name: 'php-fpm' - state: 'present' - - name: 'php-mbstring' - state: 'present' - - name: 'php-mysqlnd' - state: 'present' - - name: 'php-opcache' - state: 'present' - - name: 'php-pdo' - state: 'present' - - name: 'php-sodium' - state: 'present' - - name: 'php-xml' - state: 'present' + - name: httpd + state: present + - name: httpd-filesystem + state: present + - name: httpd-tools + state: present + - name: mod_http2 + state: present + - name: mod_md + state: present + - name: mod_ssl + state: present + - name: php + state: present + - name: php-cli + state: present + - name: php-common + state: present + - name: php-fpm + state: present + - name: php-mbstring + state: present + - name: php-mysqlnd + state: present + - name: php-opcache + state: present + - name: php-pdo + state: present + - name: php-sodium + state: present + - name: php-xml + state: present firewall_list: - permanent: 'yes' - service: 'http' - state: 'enabled' + service: http + state: enabled - permanent: 'yes' - service: 'https' - state: 'enabled' + service: https + state: enabled permission_list: - - path: '/etc/httpd/md' - group: 'apache' - owner: 'root' + - path: /etc/httpd/md + group: apache + owner: root mode: '0770' - state: 'directory' - setype: 'httpd_var_lib_t' + state: directory + setype: httpd_var_lib_t seboolean_list: - - name: 'httpd_can_network_connect' + - name: httpd_can_network_connect persistent: 'yes' state: 'yes' - - name: 'httpd_can_network_connect_db' + - name: httpd_can_network_connect_db persistent: 'yes' state: 'yes' service_list: - - name: 'httpd.service' - state: 'started' + - name: httpd.service + state: started enabled: 'yes' - - name: 'httpd-reload.timer' - state: 'started' + - name: httpd-reload.timer + state: started enabled: 'yes' - - name: 'php-fpm.service' - state: 'started' + - name: php-fpm.service + state: started enabled: 'yes' template_list: - - dest: '/etc/httpd/conf.d/autoindex.conf' - group: 'root' + - dest: /etc/httpd/conf.d/autoindex.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/autoindex.conf' - - dest: '/etc/httpd/conf.d/README' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/autoindex.conf' + - dest: /etc/httpd/conf.d/README + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/README' - - dest: '/etc/httpd/conf.d/vhost.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/README' + - dest: /etc/httpd/conf.d/vhost.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/vhost.conf' - - dest: '/etc/httpd/conf.d/ssl.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/vhost.conf' + - dest: /etc/httpd/conf.d/ssl.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/ssl.conf' - - dest: '/etc/httpd/conf.d/userdir.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/ssl.conf' + - dest: /etc/httpd/conf.d/userdir.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/userdir.conf' - - dest: '/etc/httpd/conf.d/welcome.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/userdir.conf' + - dest: /etc/httpd/conf.d/welcome.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/welcome.conf' - - dest: '/etc/httpd/conf/httpd.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/welcome.conf' + - dest: /etc/httpd/conf/httpd.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf/httpd.conf' - - dest: '/etc/httpd/conf/magic' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf/httpd.conf' + - dest: /etc/httpd/conf/magic + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf/magic' - - dest: '/etc/httpd/conf.modules.d/00-base.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf/magic' + - dest: /etc/httpd/conf.modules.d/00-base.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-base.conf' - - dest: '/etc/httpd/conf.modules.d/00-brotli.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-base.conf' + - dest: /etc/httpd/conf.modules.d/00-brotli.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-brotli.conf' - - dest: '/etc/httpd/conf.modules.d/00-dav.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-brotli.conf' + - dest: /etc/httpd/conf.modules.d/00-dav.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-dav.conf' - - dest: '/etc/httpd/conf.modules.d/00-lua.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-dav.conf' + - dest: /etc/httpd/conf.modules.d/00-lua.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-lua.conf' - - dest: '/etc/httpd/conf.modules.d/00-mpm.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-lua.conf' + - dest: /etc/httpd/conf.modules.d/00-mpm.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-mpm.conf' - - dest: '/etc/httpd/conf.modules.d/00-optional.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-mpm.conf' + - dest: /etc/httpd/conf.modules.d/00-optional.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-optional.conf' - - dest: '/etc/httpd/conf.modules.d/00-proxy.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-optional.conf' + - dest: /etc/httpd/conf.modules.d/00-proxy.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-proxy.conf' - - dest: '/etc/httpd/conf.modules.d/00-ssl.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-proxy.conf' + - dest: /etc/httpd/conf.modules.d/00-ssl.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-ssl.conf' - - dest: '/etc/httpd/conf.modules.d/00-systemd.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-ssl.conf' + - dest: /etc/httpd/conf.modules.d/00-systemd.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-systemd.conf' - - dest: '/etc/httpd/conf.modules.d/01-cgi.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-systemd.conf' + - dest: /etc/httpd/conf.modules.d/01-cgi.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/01-cgi.conf' - - dest: '/etc/httpd/conf.modules.d/01-md.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/01-cgi.conf' + - dest: /etc/httpd/conf.modules.d/01-md.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/01-md.conf' - - dest: '/etc/httpd/conf.modules.d/10-h2.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/01-md.conf' + - dest: /etc/httpd/conf.modules.d/10-h2.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/10-h2.conf' - - dest: '/etc/httpd/conf.modules.d/10-proxy_h2.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/10-h2.conf' + - dest: /etc/httpd/conf.modules.d/10-proxy_h2.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/10-proxy_h2.conf' - - dest: '/etc/httpd/conf.modules.d/README' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/10-proxy_h2.conf' + - dest: /etc/httpd/conf.modules.d/README + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/README' - - dest: '/etc/logrotate.d/httpd' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/README' + - dest: /etc/logrotate.d/httpd + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/httpd' - - dest: '/etc/sysconfig/htcacheclean' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/httpd' + - dest: /etc/sysconfig/htcacheclean + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sysconfig/htcacheclean' - - dest: '/usr/lib/systemd/system/htcacheclean.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sysconfig/htcacheclean' + - dest: /usr/lib/systemd/system/htcacheclean.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/htcacheclean.service' - - dest: '/usr/lib/systemd/system/httpd.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/htcacheclean.service' + - dest: /usr/lib/systemd/system/httpd.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.service' - - dest: '/usr/lib/systemd/system/httpd.socket' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.service' + - dest: /usr/lib/systemd/system/httpd.socket + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.socket' - - dest: '/usr/lib/systemd/system/httpd-init.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.socket' + - dest: /usr/lib/systemd/system/httpd-init.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-init.service' - - dest: '/usr/lib/systemd/system/httpd-reload.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-init.service' + - dest: /usr/lib/systemd/system/httpd-reload.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-reload.service' - - dest: '/usr/lib/systemd/system/httpd-reload.timer' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-reload.service' + - dest: /usr/lib/systemd/system/httpd-reload.timer + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-reload.timer' - - dest: '/usr/lib/systemd/system/httpd@.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-reload.timer' + - dest: /usr/lib/systemd/system/httpd@.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd@.service' - - dest: '/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd@.service' + - dest: /usr/lib/systemd/system/httpd.socket.d/10-listen443.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' diff --git a/roles/ensure_apache/vars/Fedora-43-default.yml b/roles/ensure_apache/vars/Fedora-43-default.yml index d4e42c1..08cfae1 100644 --- a/roles/ensure_apache/vars/Fedora-43-default.yml +++ b/roles/ensure_apache/vars/Fedora-43-default.yml @@ -1,229 +1,259 @@ --- # vars file for ensure_apache package_list: - - name: 'httpd' - state: 'present' - - name: 'httpd-filesystem' - state: 'present' - - name: 'httpd-tools' - state: 'present' - - name: 'mod_http2' - state: 'present' - - name: 'mod_md' - state: 'present' - - name: 'mod_ssl' - state: 'present' - - name: 'php' - state: 'present' - - name: 'php-cli' - state: 'present' - - name: 'php-common' - state: 'present' - - name: 'php-fpm' - state: 'present' - - name: 'php-mbstring' - state: 'present' - - name: 'php-mysqlnd' - state: 'present' - - name: 'php-opcache' - state: 'present' - - name: 'php-pdo' - state: 'present' - - name: 'php-sodium' - state: 'present' - - name: 'php-xml' - state: 'present' + - name: httpd + state: present + - name: httpd-filesystem + state: present + - name: httpd-tools + state: present + - name: mod_http2 + state: present + - name: mod_md + state: present + - name: mod_ssl + state: present + - name: php + state: present + - name: php-cli + state: present + - name: php-common + state: present + - name: php-fpm + state: present + - name: php-mbstring + state: present + - name: php-mysqlnd + state: present + - name: php-opcache + state: present + - name: php-pdo + state: present + - name: php-sodium + state: present + - name: php-xml + state: present firewall_list: - permanent: 'yes' - service: 'http' - state: 'enabled' + service: http + state: enabled - permanent: 'yes' - service: 'https' - state: 'enabled' + service: https + state: enabled permission_list: - - path: '/etc/httpd/md' - group: 'apache' - owner: 'root' + - path: /etc/httpd/md + group: apache + owner: root mode: '0770' - state: 'directory' - setype: 'httpd_var_lib_t' + state: directory + setype: httpd_var_lib_t seboolean_list: - - name: 'httpd_can_network_connect' + - name: httpd_can_network_connect persistent: 'yes' state: 'yes' - - name: 'httpd_can_network_connect_db' + - name: httpd_can_network_connect_db persistent: 'yes' state: 'yes' service_list: - - name: 'httpd.service' - state: 'started' + - name: httpd.service + state: started enabled: 'yes' - - name: 'httpd-reload.timer' - state: 'started' + - name: httpd-reload.timer + state: started enabled: 'yes' - - name: 'php-fpm.service' - state: 'started' + - name: php-fpm.service + state: started enabled: 'yes' template_list: - - dest: '/etc/httpd/conf.d/autoindex.conf' - group: 'root' + - dest: /etc/httpd/conf.d/autoindex.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/autoindex.conf' - - dest: '/etc/httpd/conf.d/README' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/autoindex.conf' + - dest: /etc/httpd/conf.d/README + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/README' - - dest: '/etc/httpd/conf.d/vhost.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/README' + - dest: /etc/httpd/conf.d/vhost.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/vhost.conf' - - dest: '/etc/httpd/conf.d/ssl.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/vhost.conf' + - dest: /etc/httpd/conf.d/ssl.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/ssl.conf' - - dest: '/etc/httpd/conf.d/userdir.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/ssl.conf' + - dest: /etc/httpd/conf.d/userdir.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/userdir.conf' - - dest: '/etc/httpd/conf.d/welcome.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/userdir.conf' + - dest: /etc/httpd/conf.d/welcome.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/welcome.conf' - - dest: '/etc/httpd/conf/httpd.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/welcome.conf' + - dest: /etc/httpd/conf/httpd.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf/httpd.conf' - - dest: '/etc/httpd/conf/magic' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf/httpd.conf' + - dest: /etc/httpd/conf/magic + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf/magic' - - dest: '/etc/httpd/conf.modules.d/00-base.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf/magic' + - dest: /etc/httpd/conf.modules.d/00-base.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-base.conf' - - dest: '/etc/httpd/conf.modules.d/00-brotli.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-base.conf' + - dest: /etc/httpd/conf.modules.d/00-brotli.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-brotli.conf' - - dest: '/etc/httpd/conf.modules.d/00-dav.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-brotli.conf' + - dest: /etc/httpd/conf.modules.d/00-dav.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-dav.conf' - - dest: '/etc/httpd/conf.modules.d/00-lua.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-dav.conf' + - dest: /etc/httpd/conf.modules.d/00-lua.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-lua.conf' - - dest: '/etc/httpd/conf.modules.d/00-mpm.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-lua.conf' + - dest: /etc/httpd/conf.modules.d/00-mpm.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-mpm.conf' - - dest: '/etc/httpd/conf.modules.d/00-optional.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-mpm.conf' + - dest: /etc/httpd/conf.modules.d/00-optional.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-optional.conf' - - dest: '/etc/httpd/conf.modules.d/00-proxy.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-optional.conf' + - dest: /etc/httpd/conf.modules.d/00-proxy.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-proxy.conf' - - dest: '/etc/httpd/conf.modules.d/00-ssl.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-proxy.conf' + - dest: /etc/httpd/conf.modules.d/00-ssl.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-ssl.conf' - - dest: '/etc/httpd/conf.modules.d/00-systemd.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-ssl.conf' + - dest: /etc/httpd/conf.modules.d/00-systemd.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-systemd.conf' - - dest: '/etc/httpd/conf.modules.d/01-cgi.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-systemd.conf' + - dest: /etc/httpd/conf.modules.d/01-cgi.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/01-cgi.conf' - - dest: '/etc/httpd/conf.modules.d/01-md.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/01-cgi.conf' + - dest: /etc/httpd/conf.modules.d/01-md.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/01-md.conf' - - dest: '/etc/httpd/conf.modules.d/10-h2.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/01-md.conf' + - dest: /etc/httpd/conf.modules.d/10-h2.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/10-h2.conf' - - dest: '/etc/httpd/conf.modules.d/10-proxy_h2.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/10-h2.conf' + - dest: /etc/httpd/conf.modules.d/10-proxy_h2.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/10-proxy_h2.conf' - - dest: '/etc/httpd/conf.modules.d/README' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/10-proxy_h2.conf' + - dest: /etc/httpd/conf.modules.d/README + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/README' - - dest: '/etc/logrotate.d/httpd' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/README' + - dest: /etc/logrotate.d/httpd + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/httpd' - - dest: '/etc/sysconfig/htcacheclean' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/httpd' + - dest: /etc/sysconfig/htcacheclean + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sysconfig/htcacheclean' - - dest: '/usr/lib/systemd/system/htcacheclean.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sysconfig/htcacheclean' + - dest: /usr/lib/systemd/system/htcacheclean.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/htcacheclean.service' - - dest: '/usr/lib/systemd/system/httpd.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/htcacheclean.service' + - dest: /usr/lib/systemd/system/httpd.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.service' - - dest: '/usr/lib/systemd/system/httpd.socket' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.service' + - dest: /usr/lib/systemd/system/httpd.socket + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.socket' - - dest: '/usr/lib/systemd/system/httpd-init.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.socket' + - dest: /usr/lib/systemd/system/httpd-init.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-init.service' - - dest: '/usr/lib/systemd/system/httpd-reload.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-init.service' + - dest: /usr/lib/systemd/system/httpd-reload.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-reload.service' - - dest: '/usr/lib/systemd/system/httpd-reload.timer' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-reload.service' + - dest: /usr/lib/systemd/system/httpd-reload.timer + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-reload.timer' - - dest: '/usr/lib/systemd/system/httpd@.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-reload.timer' + - dest: /usr/lib/systemd/system/httpd@.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd@.service' - - dest: '/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd@.service' + - dest: /usr/lib/systemd/system/httpd.socket.d/10-listen443.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' diff --git a/roles/ensure_apache/vars/Fedora-44-default.yml b/roles/ensure_apache/vars/Fedora-44-default.yml index 861232d..de518de 100644 --- a/roles/ensure_apache/vars/Fedora-44-default.yml +++ b/roles/ensure_apache/vars/Fedora-44-default.yml @@ -1,234 +1,265 @@ --- # vars file for ensure_apache package_list: - - name: 'httpd' - state: 'present' - - name: 'httpd-filesystem' - state: 'present' - - name: 'httpd-tools' - state: 'present' - - name: 'mod_http2' - state: 'present' - - name: 'mod_md' - state: 'present' - - name: 'mod_ssl' - state: 'present' - - name: 'php' - state: 'present' - - name: 'php-cli' - state: 'present' - - name: 'php-common' - state: 'present' - - name: 'php-fpm' - state: 'present' - - name: 'php-mbstring' - state: 'present' - - name: 'php-mysqlnd' - state: 'present' - - name: 'php-opcache' - state: 'present' - - name: 'php-pdo' - state: 'present' - - name: 'php-sodium' - state: 'present' - - name: 'php-xml' - state: 'present' + - name: httpd + state: present + - name: httpd-filesystem + state: present + - name: httpd-tools + state: present + - name: mod_http2 + state: present + - name: mod_md + state: present + - name: mod_ssl + state: present + - name: php + state: present + - name: php-cli + state: present + - name: php-common + state: present + - name: php-fpm + state: present + - name: php-mbstring + state: present + - name: php-mysqlnd + state: present + - name: php-opcache + state: present + - name: php-pdo + state: present + - name: php-sodium + state: present + - name: php-xml + state: present firewall_list: - permanent: 'yes' - service: 'http' - state: 'enabled' + service: http + state: enabled - permanent: 'yes' - service: 'https' - state: 'enabled' + service: https + state: enabled permission_list: - - path: '/etc/httpd/md' - group: 'apache' - owner: 'root' + - path: /etc/httpd/md + group: apache + owner: root mode: '0770' - state: 'directory' - setype: 'httpd_var_lib_t' + state: directory + setype: httpd_var_lib_t seboolean_list: - - name: 'httpd_can_network_connect' + - name: httpd_can_network_connect persistent: 'yes' state: 'yes' - - name: 'httpd_can_network_connect_db' + - name: httpd_can_network_connect_db persistent: 'yes' state: 'yes' service_list: - - name: 'httpd.service' - state: 'started' + - name: httpd.service + state: started enabled: 'yes' - - name: 'httpd-reload.timer' - state: 'started' + - name: httpd-reload.timer + state: started enabled: 'yes' - - name: 'php-fpm.service' - state: 'started' + - name: php-fpm.service + state: started enabled: 'yes' template_list: - - dest: '/etc/httpd/conf.d/autoindex.conf' - group: 'root' + - dest: /etc/httpd/conf.d/autoindex.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/autoindex.conf' - - dest: '/etc/httpd/conf.d/README' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/autoindex.conf' + - dest: /etc/httpd/conf.d/README + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/README' - - dest: '/etc/httpd/conf.d/vhost.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/README' + - dest: /etc/httpd/conf.d/vhost.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/vhost.conf' - - dest: '/etc/httpd/conf.d/ssl.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/vhost.conf' + - dest: /etc/httpd/conf.d/ssl.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/ssl.conf' - - dest: '/etc/httpd/conf.d/userdir.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/ssl.conf' + - dest: /etc/httpd/conf.d/userdir.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/userdir.conf' - - dest: '/etc/httpd/conf.d/welcome.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/userdir.conf' + - dest: /etc/httpd/conf.d/welcome.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/welcome.conf' - - dest: '/etc/httpd/conf/httpd.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/welcome.conf' + - dest: /etc/httpd/conf/httpd.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf/httpd.conf' - - dest: '/etc/httpd/conf/magic' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf/httpd.conf' + - dest: /etc/httpd/conf/magic + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf/magic' - - dest: '/etc/httpd/conf.modules.d/00-base.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf/magic' + - dest: /etc/httpd/conf.modules.d/00-base.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-base.conf' - - dest: '/etc/httpd/conf.modules.d/00-brotli.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-base.conf' + - dest: /etc/httpd/conf.modules.d/00-brotli.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-brotli.conf' - - dest: '/etc/httpd/conf.modules.d/00-dav.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-brotli.conf' + - dest: /etc/httpd/conf.modules.d/00-dav.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-dav.conf' - - dest: '/etc/httpd/conf.modules.d/00-lua.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-dav.conf' + - dest: /etc/httpd/conf.modules.d/00-lua.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-lua.conf' - - dest: '/etc/httpd/conf.modules.d/00-mpm.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-lua.conf' + - dest: /etc/httpd/conf.modules.d/00-mpm.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-mpm.conf' - - dest: '/etc/httpd/conf.modules.d/00-optional.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-mpm.conf' + - dest: /etc/httpd/conf.modules.d/00-optional.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-optional.conf' - - dest: '/etc/httpd/conf.modules.d/00-proxy.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-optional.conf' + - dest: /etc/httpd/conf.modules.d/00-proxy.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-proxy.conf' - - dest: '/etc/httpd/conf.modules.d/00-ssl.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-proxy.conf' + - dest: /etc/httpd/conf.modules.d/00-ssl.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-ssl.conf' - - dest: '/etc/httpd/conf.modules.d/00-systemd.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-ssl.conf' + - dest: /etc/httpd/conf.modules.d/00-systemd.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/00-systemd.conf' - - dest: '/etc/httpd/conf.modules.d/01-cgi.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/00-systemd.conf' + - dest: /etc/httpd/conf.modules.d/01-cgi.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/01-cgi.conf' - - dest: '/etc/httpd/conf.modules.d/01-md.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/01-cgi.conf' + - dest: /etc/httpd/conf.modules.d/01-md.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/01-md.conf' - - dest: '/etc/httpd/conf.modules.d/10-h2.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/01-md.conf' + - dest: /etc/httpd/conf.modules.d/10-h2.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/10-h2.conf' - - dest: '/etc/httpd/conf.modules.d/10-proxy_h2.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/10-h2.conf' + - dest: /etc/httpd/conf.modules.d/10-proxy_h2.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/10-proxy_h2.conf' - - dest: '/etc/httpd/conf.modules.d/README' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/10-proxy_h2.conf' + - dest: /etc/httpd/conf.modules.d/README + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.modules.d/README' - - dest: '/etc/logrotate.d/httpd' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.modules.d/README' + - dest: /etc/logrotate.d/httpd + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/httpd' - - dest: '/etc/sysconfig/htcacheclean' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/httpd' + - dest: /etc/sysconfig/htcacheclean + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sysconfig/htcacheclean' - - dest: '/usr/lib/systemd/system/htcacheclean.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sysconfig/htcacheclean' + - dest: /usr/lib/systemd/system/htcacheclean.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/htcacheclean.service' - - dest: '/usr/lib/systemd/system/httpd.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/htcacheclean.service' + - dest: /usr/lib/systemd/system/httpd.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.service' - - dest: '/usr/lib/systemd/system/httpd.socket' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.service' + - dest: /usr/lib/systemd/system/httpd.socket + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.socket' - - dest: '/usr/lib/systemd/system/httpd-init.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.socket' + - dest: /usr/lib/systemd/system/httpd-init.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-init.service' - - dest: '/usr/lib/systemd/system/httpd-reload.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-init.service' + - dest: /usr/lib/systemd/system/httpd-reload.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-reload.service' - - dest: '/usr/lib/systemd/system/httpd-reload.timer' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-reload.service' + - dest: /usr/lib/systemd/system/httpd-reload.timer + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd-reload.timer' - - dest: '/usr/lib/systemd/system/httpd@.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd-reload.timer' + - dest: /usr/lib/systemd/system/httpd@.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd@.service' - - dest: '/usr/lib/systemd/system/httpd.service.d/php-fpm.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd@.service' + - dest: /usr/lib/systemd/system/httpd.service.d/php-fpm.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.service.d/php-fpm.conf' - - dest: '/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.service.d/php-fpm.conf' + - dest: /usr/lib/systemd/system/httpd.socket.d/10-listen443.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/httpd.socket.d/10-listen443.conf' diff --git a/roles/ensure_apache/vars/default.yml b/roles/ensure_apache/vars/default.yml index c7215c2..91da2a7 100644 --- a/roles/ensure_apache/vars/default.yml +++ b/roles/ensure_apache/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_apache \ No newline at end of file +... diff --git a/roles/ensure_apache/vars/main.yml b/roles/ensure_apache/vars/main.yml index c7215c2..91da2a7 100644 --- a/roles/ensure_apache/vars/main.yml +++ b/roles/ensure_apache/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_apache \ No newline at end of file +... diff --git a/roles/ensure_cockpit/.travis.yml b/roles/ensure_cockpit/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_cockpit/.travis.yml +++ b/roles/ensure_cockpit/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_cockpit/defaults/main.yml b/roles/ensure_cockpit/defaults/main.yml index 1474d40..91da2a7 100644 --- a/roles/ensure_cockpit/defaults/main.yml +++ b/roles/ensure_cockpit/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_cockpit \ No newline at end of file +... diff --git a/roles/ensure_cockpit/handlers/main.yml b/roles/ensure_cockpit/handlers/main.yml index 33b9f20..54007a3 100644 --- a/roles/ensure_cockpit/handlers/main.yml +++ b/roles/ensure_cockpit/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_cockpit -- name: 'ensure_cockpit.package_facts' +- name: ensure_cockpit.package_facts ansible.builtin.package_facts: -- name: 'ensure_cockpit.service_facts' +- name: ensure_cockpit.service_facts ansible.builtin.service_facts: -- name: 'ensure_cockpit.service_reload' +- name: ensure_cockpit.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_cockpit is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_cockpit.service_restart' +- name: ensure_cockpit.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_cockpit is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_cockpit.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_cockpit/meta/main.yml b/roles/ensure_cockpit/meta/main.yml index 931f95d..f223a38 100644 --- a/roles/ensure_cockpit/meta/main.yml +++ b/roles/ensure_cockpit/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensures cockpit is installed, running, and functional @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - diff --git a/roles/ensure_cockpit/tasks/main.yml b/roles/ensure_cockpit/tasks/main.yml index ed81f4b..b842021 100644 --- a/roles/ensure_cockpit/tasks/main.yml +++ b/roles/ensure_cockpit/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_cockpit -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_cockpit' + name: ensure_cockpit vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_cockpit is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_cockpit.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_cockpit.package_facts' - - 'ensure_cockpit.service_facts' -- name: 'ensure configurations' + notify: [ensure_cockpit.package_facts, ensure_cockpit.service_facts] +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_cockpit is defined @@ -65,11 +65,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_cockpit.package_facts' - - 'ensure_cockpit.service_facts' - - 'ensure_cockpit.service_reload' - - 'ensure_cockpit.service_restart' -- name: 'ensure services' + - ensure_cockpit.package_facts + - ensure_cockpit.service_facts + - ensure_cockpit.service_reload + - ensure_cockpit.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_cockpit is defined @@ -82,10 +82,6 @@ loop: '{{ ensure_cockpit.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_cockpit.package_facts' - - 'ensure_cockpit.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + notify: [ensure_cockpit.package_facts, ensure_cockpit.service_facts] +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_cockpit/tests/test.yml b/roles/ensure_cockpit/tests/test.yml index e1897fe..ddf4401 100644 --- a/roles/ensure_cockpit/tests/test.yml +++ b/roles/ensure_cockpit/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_cockpit \ No newline at end of file + roles: [ensure_cockpit] diff --git a/roles/ensure_cockpit/vars/AlmaLinux-10-default.yml b/roles/ensure_cockpit/vars/AlmaLinux-10-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_cockpit/vars/AlmaLinux-10-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/AlmaLinux-9-default.yml b/roles/ensure_cockpit/vars/AlmaLinux-9-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_cockpit/vars/AlmaLinux-9-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/CentOS-10-default.yml b/roles/ensure_cockpit/vars/CentOS-10-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/CentOS-10-default.yml +++ b/roles/ensure_cockpit/vars/CentOS-10-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/CentOS-9-default.yml b/roles/ensure_cockpit/vars/CentOS-9-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/CentOS-9-default.yml +++ b/roles/ensure_cockpit/vars/CentOS-9-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Debian-11-default.yml b/roles/ensure_cockpit/vars/Debian-11-default.yml index 17fb50c..26b92b9 100644 --- a/roles/ensure_cockpit/vars/Debian-11-default.yml +++ b/roles/ensure_cockpit/vars/Debian-11-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Debian-12-default.yml b/roles/ensure_cockpit/vars/Debian-12-default.yml index 57e7336..d85b220 100644 --- a/roles/ensure_cockpit/vars/Debian-12-default.yml +++ b/roles/ensure_cockpit/vars/Debian-12-default.yml @@ -1,27 +1,25 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Debian-13-default.yml b/roles/ensure_cockpit/vars/Debian-13-default.yml index 57e7336..d85b220 100644 --- a/roles/ensure_cockpit/vars/Debian-13-default.yml +++ b/roles/ensure_cockpit/vars/Debian-13-default.yml @@ -1,27 +1,25 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Fedora-42-default.yml b/roles/ensure_cockpit/vars/Fedora-42-default.yml index 48f272d..6b43c9d 100644 --- a/roles/ensure_cockpit/vars/Fedora-42-default.yml +++ b/roles/ensure_cockpit/vars/Fedora-42-default.yml @@ -1,31 +1,29 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-kdump + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-selinux + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Fedora-43-default.yml b/roles/ensure_cockpit/vars/Fedora-43-default.yml index 48f272d..6b43c9d 100644 --- a/roles/ensure_cockpit/vars/Fedora-43-default.yml +++ b/roles/ensure_cockpit/vars/Fedora-43-default.yml @@ -1,31 +1,29 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-kdump + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-selinux + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Fedora-44-default.yml b/roles/ensure_cockpit/vars/Fedora-44-default.yml index 48f272d..6b43c9d 100644 --- a/roles/ensure_cockpit/vars/Fedora-44-default.yml +++ b/roles/ensure_cockpit/vars/Fedora-44-default.yml @@ -1,31 +1,29 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-kdump + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-selinux + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/OracleLinux-10-default.yml b/roles/ensure_cockpit/vars/OracleLinux-10-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/OracleLinux-10-default.yml +++ b/roles/ensure_cockpit/vars/OracleLinux-10-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/OracleLinux-9-default.yml b/roles/ensure_cockpit/vars/OracleLinux-9-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/OracleLinux-9-default.yml +++ b/roles/ensure_cockpit/vars/OracleLinux-9-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Rocky-10-default.yml b/roles/ensure_cockpit/vars/Rocky-10-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/Rocky-10-default.yml +++ b/roles/ensure_cockpit/vars/Rocky-10-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Rocky-9-default.yml b/roles/ensure_cockpit/vars/Rocky-9-default.yml index 12890bf..35e7233 100644 --- a/roles/ensure_cockpit/vars/Rocky-9-default.yml +++ b/roles/ensure_cockpit/vars/Rocky-9-default.yml @@ -1,25 +1,23 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' - - name: 'cockpit-ws-selinux' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present + - name: cockpit-ws-selinux + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Ubuntu-22-default.yml b/roles/ensure_cockpit/vars/Ubuntu-22-default.yml index 57e7336..d85b220 100644 --- a/roles/ensure_cockpit/vars/Ubuntu-22-default.yml +++ b/roles/ensure_cockpit/vars/Ubuntu-22-default.yml @@ -1,27 +1,25 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Ubuntu-24-default.yml b/roles/ensure_cockpit/vars/Ubuntu-24-default.yml index 57e7336..d85b220 100644 --- a/roles/ensure_cockpit/vars/Ubuntu-24-default.yml +++ b/roles/ensure_cockpit/vars/Ubuntu-24-default.yml @@ -1,27 +1,25 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/Ubuntu-26-default.yml b/roles/ensure_cockpit/vars/Ubuntu-26-default.yml index 57e7336..d85b220 100644 --- a/roles/ensure_cockpit/vars/Ubuntu-26-default.yml +++ b/roles/ensure_cockpit/vars/Ubuntu-26-default.yml @@ -1,27 +1,25 @@ --- # vars file for ensure_cockpit package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' + - name: cockpit + state: present + - name: cockpit-bridge + state: present + - name: cockpit-doc + state: present + - name: cockpit-networkmanager + state: present + - name: cockpit-packagekit + state: present + - name: cockpit-sosreport + state: present + - name: cockpit-storaged + state: present + - name: cockpit-system + state: present + - name: cockpit-ws + state: present service_list: - - name: 'cockpit.socket' - state: 'started' + - name: cockpit.socket + state: started enabled: 'yes' -... - diff --git a/roles/ensure_cockpit/vars/default.yml b/roles/ensure_cockpit/vars/default.yml index 3db30dc..91da2a7 100644 --- a/roles/ensure_cockpit/vars/default.yml +++ b/roles/ensure_cockpit/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_cockpit \ No newline at end of file +... diff --git a/roles/ensure_cockpit/vars/main.yml b/roles/ensure_cockpit/vars/main.yml index 3db30dc..91da2a7 100644 --- a/roles/ensure_cockpit/vars/main.yml +++ b/roles/ensure_cockpit/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_cockpit \ No newline at end of file +... diff --git a/roles/ensure_dovecot/.travis.yml b/roles/ensure_dovecot/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_dovecot/.travis.yml +++ b/roles/ensure_dovecot/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_dovecot/defaults/main.yml b/roles/ensure_dovecot/defaults/main.yml index 6ee41e9..526cf3b 100644 --- a/roles/ensure_dovecot/defaults/main.yml +++ b/roles/ensure_dovecot/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ensure_dovecot dovecot_vhost: '{{ inventory_hostname }}' -dovecot_quota: '1G' +dovecot_quota: 1G diff --git a/roles/ensure_dovecot/handlers/main.yml b/roles/ensure_dovecot/handlers/main.yml index f7e47f4..f923ca0 100644 --- a/roles/ensure_dovecot/handlers/main.yml +++ b/roles/ensure_dovecot/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_dovecot -- name: 'ensure_dovecot.package_facts' +- name: ensure_dovecot.package_facts ansible.builtin.package_facts: -- name: 'ensure_dovecot.service_facts' +- name: ensure_dovecot.service_facts ansible.builtin.service_facts: -- name: 'ensure_dovecot.service_reload' +- name: ensure_dovecot.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_dovecot is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_dovecot.service_restart' +- name: ensure_dovecot.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_dovecot is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_dovecot.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_dovecot/meta/main.yml b/roles/ensure_dovecot/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_dovecot/meta/main.yml +++ b/roles/ensure_dovecot/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_dovecot/tasks/main.yml b/roles/ensure_dovecot/tasks/main.yml index 36a8591..840a589 100644 --- a/roles/ensure_dovecot/tasks/main.yml +++ b/roles/ensure_dovecot/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_dovecot -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_dovecot' + name: ensure_dovecot vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure sysctl' +- name: ensure sysctl when: - ansible_facts["system"] == 'Linux' - ensure_dovecot is defined @@ -46,11 +48,11 @@ loop_control: label: '{{ item.name }} will be {{ item.value }}' notify: - - 'ensure_dovecot.package_facts' - - 'ensure_dovecot.service_facts' - - 'ensure_dovecot.service_reload' - - 'ensure_dovecot.service_restart' -- name: 'ensure packages' + - ensure_dovecot.package_facts + - ensure_dovecot.service_facts + - ensure_dovecot.service_reload + - ensure_dovecot.service_restart +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_dovecot is defined @@ -63,11 +65,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_dovecot.package_facts' - - 'ensure_dovecot.service_facts' - - 'ensure_dovecot.service_reload' - - 'ensure_dovecot.service_restart' -- name: 'ensure seboolean' + - ensure_dovecot.package_facts + - ensure_dovecot.service_facts + - ensure_dovecot.service_reload + - ensure_dovecot.service_restart +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_dovecot is defined @@ -81,11 +83,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_dovecot.package_facts' - - 'ensure_dovecot.service_facts' - - 'ensure_dovecot.service_reload' - - 'ensure_dovecot.service_restart' -- name: 'ensure configurations' + - ensure_dovecot.package_facts + - ensure_dovecot.service_facts + - ensure_dovecot.service_reload + - ensure_dovecot.service_restart +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_dovecot is defined @@ -106,11 +108,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_dovecot.package_facts' - - 'ensure_dovecot.service_facts' - - 'ensure_dovecot.service_reload' - - 'ensure_dovecot.service_restart' -- name: 'ensure firewall' + - ensure_dovecot.package_facts + - ensure_dovecot.service_facts + - ensure_dovecot.service_reload + - ensure_dovecot.service_restart +- name: ensure firewall when: - ansible_facts["system"] == 'Linux' - ansible_facts.packages["firewalld"] is defined @@ -126,11 +128,11 @@ loop_control: label: '{{ item.service }} will be {{ item.state }}' notify: - - 'ensure_dovecot.package_facts' - - 'ensure_dovecot.service_facts' - - 'ensure_dovecot.service_reload' - - 'ensure_dovecot.service_restart' -- name: 'ensure services' + - ensure_dovecot.package_facts + - ensure_dovecot.service_facts + - ensure_dovecot.service_reload + - ensure_dovecot.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_dovecot is defined @@ -143,10 +145,6 @@ loop: '{{ ensure_dovecot.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_dovecot.package_facts' - - 'ensure_dovecot.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + notify: [ensure_dovecot.package_facts, ensure_dovecot.service_facts] +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_dovecot/tests/test.yml b/roles/ensure_dovecot/tests/test.yml index 83f4754..dc2f3d3 100644 --- a/roles/ensure_dovecot/tests/test.yml +++ b/roles/ensure_dovecot/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_dovecot \ No newline at end of file + roles: [ensure_dovecot] diff --git a/roles/ensure_dovecot/vars/Fedora-42-default.yml b/roles/ensure_dovecot/vars/Fedora-42-default.yml index 63c9afa..6c94576 100644 --- a/roles/ensure_dovecot/vars/Fedora-42-default.yml +++ b/roles/ensure_dovecot/vars/Fedora-42-default.yml @@ -1,100 +1,131 @@ --- # vars file for ensure_dovecot package_list: - - name: 'dovecot' - state: 'present' - - name: 'dovecot-fts-xapian' - state: 'present' - - name: 'dovecot-mysql' - state: 'present' - - name: 'dovecot-pigeonhole' - state: 'present' + - name: dovecot + state: present + - name: dovecot-fts-xapian + state: present + - name: dovecot-mysql + state: present + - name: dovecot-pigeonhole + state: present firewall_list: - permanent: 'yes' - service: 'imap' - state: 'enabled' + service: imap + state: enabled - permanent: 'yes' - service: 'imaps' - state: 'enabled' + service: imaps + state: enabled service_list: - enabled: 'yes' - name: 'dovecot.service' - state: 'started' + name: dovecot.service + state: started - enabled: 'yes' - name: 'dovecot-copytls.service' - state: 'started' + name: dovecot-copytls.service + state: started - enabled: 'yes' - name: 'dovecot-copytls.timer' - state: 'started' + name: dovecot-copytls.timer + state: started template_list: - - dest: '/etc/dovecot/conf.d/10-auth.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/10-auth.conf' - - dest: '/etc/dovecot/conf.d/10-director.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/10-director.conf' - - dest: '/etc/dovecot/conf.d/10-logging.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/10-logging.conf' - - dest: '/etc/dovecot/conf.d/10-mail.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/10-mail.conf' - - dest: '/etc/dovecot/conf.d/10-master.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/10-master.conf' - - dest: '/etc/dovecot/conf.d/10-metrics.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/10-metrics.conf' - - dest: '/etc/dovecot/conf.d/10-ssl.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/10-ssl.conf' - - dest: '/etc/dovecot/conf.d/15-lda.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/15-lda.conf' - - dest: '/etc/dovecot/conf.d/15-mailboxes.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/15-mailboxes.conf' - - dest: '/etc/dovecot/conf.d/20-imap.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/20-imap.conf' - - dest: '/etc/dovecot/conf.d/20-lmtp.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/20-lmtp.conf' - - dest: '/etc/dovecot/conf.d/20-pop3.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/20-pop3.conf' - - dest: '/etc/dovecot/conf.d/20-submission.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/20-submission.conf' - - dest: '/etc/dovecot/conf.d/90-acl.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/90-acl.conf' - - dest: '/etc/dovecot/conf.d/90-plugin.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/90-plugin.conf' - - dest: '/etc/dovecot/conf.d/90-quota.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/90-quota.conf' - - dest: '/etc/dovecot/conf.d/auth-checkpassword.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-checkpassword.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-deny.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-deny.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-dict.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-dict.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-ldap.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-ldap.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-master.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-master.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-passwdfile.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-passwdfile.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-sql.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-sql.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-static.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-static.conf.ext' - - dest: '/etc/dovecot/conf.d/auth-system.conf.ext' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/auth-system.conf.ext' - - dest: '/etc/dovecot/conf.d/20-managesieve.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/20-managesieve.conf' - - dest: '/etc/dovecot/conf.d/90-sieve-extprograms.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/90-sieve-extprograms.conf' - - dest: '/etc/dovecot/conf.d/90-sieve.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/90-sieve.conf' - - dest: '/etc/dovecot/dovecot.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/dovecot.conf' - - dest: '/etc/dovecot/local.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/local.conf' - - dest: '/etc/dovecot/accounts' - group: 'dovecot' + - dest: /etc/dovecot/conf.d/10-auth.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/10-auth.conf' + - dest: /etc/dovecot/conf.d/10-director.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/10-director.conf' + - dest: /etc/dovecot/conf.d/10-logging.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/10-logging.conf' + - dest: /etc/dovecot/conf.d/10-mail.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/10-mail.conf' + - dest: /etc/dovecot/conf.d/10-master.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/10-master.conf' + - dest: /etc/dovecot/conf.d/10-metrics.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/10-metrics.conf' + - dest: /etc/dovecot/conf.d/10-ssl.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/10-ssl.conf' + - dest: /etc/dovecot/conf.d/15-lda.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/15-lda.conf' + - dest: /etc/dovecot/conf.d/15-mailboxes.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/15-mailboxes.conf' + - dest: /etc/dovecot/conf.d/20-imap.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/20-imap.conf' + - dest: /etc/dovecot/conf.d/20-lmtp.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/20-lmtp.conf' + - dest: /etc/dovecot/conf.d/20-pop3.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/20-pop3.conf' + - dest: /etc/dovecot/conf.d/20-submission.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/20-submission.conf' + - dest: /etc/dovecot/conf.d/90-acl.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/90-acl.conf' + - dest: /etc/dovecot/conf.d/90-plugin.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/90-plugin.conf' + - dest: /etc/dovecot/conf.d/90-quota.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/90-quota.conf' + - dest: /etc/dovecot/conf.d/auth-checkpassword.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-checkpassword.conf.ext' + - dest: /etc/dovecot/conf.d/auth-deny.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-deny.conf.ext' + - dest: /etc/dovecot/conf.d/auth-dict.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-dict.conf.ext' + - dest: /etc/dovecot/conf.d/auth-ldap.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-ldap.conf.ext' + - dest: /etc/dovecot/conf.d/auth-master.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-master.conf.ext' + - dest: /etc/dovecot/conf.d/auth-passwdfile.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-passwdfile.conf.ext' + - dest: /etc/dovecot/conf.d/auth-sql.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-sql.conf.ext' + - dest: /etc/dovecot/conf.d/auth-static.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-static.conf.ext' + - dest: /etc/dovecot/conf.d/auth-system.conf.ext + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/auth-system.conf.ext' + - dest: /etc/dovecot/conf.d/20-managesieve.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/20-managesieve.conf' + - dest: /etc/dovecot/conf.d/90-sieve-extprograms.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/90-sieve-extprograms.conf' + - dest: /etc/dovecot/conf.d/90-sieve.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/90-sieve.conf' + - dest: /etc/dovecot/dovecot.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/dovecot.conf' + - dest: /etc/dovecot/local.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/local.conf' + - dest: /etc/dovecot/accounts + group: dovecot mode: '0600' - owner: 'dovecot' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/accounts' - - dest: '/usr/lib/systemd/system/dovecot-copytls.service' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/dovecot-copytls.service' - - dest: '/usr/lib/systemd/system/dovecot-copytls.timer' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/dovecot-copytls.timer' -... - + owner: dovecot + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/accounts' + - dest: /usr/lib/systemd/system/dovecot-copytls.service + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/dovecot-copytls.service' + - dest: /usr/lib/systemd/system/dovecot-copytls.timer + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/dovecot-copytls.timer' diff --git a/roles/ensure_dovecot/vars/Fedora-43-default.yml b/roles/ensure_dovecot/vars/Fedora-43-default.yml index c2c2694..3089e5d 100644 --- a/roles/ensure_dovecot/vars/Fedora-43-default.yml +++ b/roles/ensure_dovecot/vars/Fedora-43-default.yml @@ -1,44 +1,47 @@ --- # vars file for ensure_dovecot package_list: - - name: 'dovecot' - state: 'present' - - name: 'dovecot-fts-xapian' - state: 'present' - - name: 'dovecot-mysql' - state: 'present' - - name: 'dovecot-pigeonhole' - state: 'present' + - name: dovecot + state: present + - name: dovecot-fts-xapian + state: present + - name: dovecot-mysql + state: present + - name: dovecot-pigeonhole + state: present firewall_list: - permanent: 'yes' - service: 'imap' - state: 'enabled' + service: imap + state: enabled - permanent: 'yes' - service: 'imaps' - state: 'enabled' + service: imaps + state: enabled service_list: - enabled: 'yes' - name: 'dovecot.service' - state: 'started' + name: dovecot.service + state: started - enabled: 'yes' - name: 'dovecot-copytls.service' - state: 'started' + name: dovecot-copytls.service + state: started - enabled: 'yes' - name: 'dovecot-copytls.timer' - state: 'started' + name: dovecot-copytls.timer + state: started template_list: - - dest: '/etc/dovecot/dovecot.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/dovecot.conf' - - dest: '/etc/dovecot/conf.d/local.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/local.conf' - - dest: '/etc/dovecot/accounts' - group: 'dovecot' + - dest: /etc/dovecot/dovecot.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/dovecot.conf' + - dest: /etc/dovecot/conf.d/local.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/local.conf' + - dest: /etc/dovecot/accounts + group: dovecot mode: '0600' - owner: 'dovecot' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/accounts' - - dest: '/usr/lib/systemd/system/dovecot-copytls.service' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/dovecot-copytls.service' - - dest: '/usr/lib/systemd/system/dovecot-copytls.timer' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/dovecot-copytls.timer' -... - + owner: dovecot + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/accounts' + - dest: /usr/lib/systemd/system/dovecot-copytls.service + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/dovecot-copytls.service' + - dest: /usr/lib/systemd/system/dovecot-copytls.timer + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/dovecot-copytls.timer' diff --git a/roles/ensure_dovecot/vars/Fedora-44-default.yml b/roles/ensure_dovecot/vars/Fedora-44-default.yml index 48d02fe..3089e5d 100644 --- a/roles/ensure_dovecot/vars/Fedora-44-default.yml +++ b/roles/ensure_dovecot/vars/Fedora-44-default.yml @@ -1,43 +1,47 @@ --- # vars file for ensure_dovecot package_list: - - name: 'dovecot' - state: 'present' - - name: 'dovecot-fts-xapian' - state: 'present' - - name: 'dovecot-mysql' - state: 'present' - - name: 'dovecot-pigeonhole' - state: 'present' + - name: dovecot + state: present + - name: dovecot-fts-xapian + state: present + - name: dovecot-mysql + state: present + - name: dovecot-pigeonhole + state: present firewall_list: - permanent: 'yes' - service: 'imap' - state: 'enabled' + service: imap + state: enabled - permanent: 'yes' - service: 'imaps' - state: 'enabled' + service: imaps + state: enabled service_list: - enabled: 'yes' - name: 'dovecot.service' - state: 'started' + name: dovecot.service + state: started - enabled: 'yes' - name: 'dovecot-copytls.service' - state: 'started' + name: dovecot-copytls.service + state: started - enabled: 'yes' - name: 'dovecot-copytls.timer' - state: 'started' + name: dovecot-copytls.timer + state: started template_list: - - dest: '/etc/dovecot/dovecot.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/dovecot.conf' - - dest: '/etc/dovecot/conf.d/local.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/conf.d/local.conf' - - dest: '/etc/dovecot/accounts' - group: 'dovecot' + - dest: /etc/dovecot/dovecot.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/dovecot.conf' + - dest: /etc/dovecot/conf.d/local.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/conf.d/local.conf' + - dest: /etc/dovecot/accounts + group: dovecot mode: '0600' - owner: 'dovecot' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dovecot/accounts' - - dest: '/usr/lib/systemd/system/dovecot-copytls.service' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/dovecot-copytls.service' - - dest: '/usr/lib/systemd/system/dovecot-copytls.timer' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/dovecot-copytls.timer' -... + owner: dovecot + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dovecot/accounts' + - dest: /usr/lib/systemd/system/dovecot-copytls.service + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/dovecot-copytls.service' + - dest: /usr/lib/systemd/system/dovecot-copytls.timer + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/dovecot-copytls.timer' diff --git a/roles/ensure_dovecot/vars/default.yml b/roles/ensure_dovecot/vars/default.yml index c710323..91da2a7 100644 --- a/roles/ensure_dovecot/vars/default.yml +++ b/roles/ensure_dovecot/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_dovecot \ No newline at end of file +... diff --git a/roles/ensure_dovecot/vars/main.yml b/roles/ensure_dovecot/vars/main.yml index c710323..91da2a7 100644 --- a/roles/ensure_dovecot/vars/main.yml +++ b/roles/ensure_dovecot/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_dovecot \ No newline at end of file +... diff --git a/roles/ensure_fail2ban/handlers/main.yml b/roles/ensure_fail2ban/handlers/main.yml new file mode 100644 index 0000000..945f218 --- /dev/null +++ b/roles/ensure_fail2ban/handlers/main.yml @@ -0,0 +1,14 @@ +--- +# handlers file for ensure_fail2ban +- name: ensure_fail2ban.package_facts + ansible.builtin.package_facts: +- name: ensure_fail2ban.service_facts + ansible.builtin.service_facts: +- name: ensure_fail2ban.service_reload + ansible.builtin.service: + name: fail2ban + state: reloaded +- name: ensure_fail2ban.service_restart + ansible.builtin.service: + name: fail2ban + state: restarted diff --git a/roles/ensure_fail2ban/meta/main.yml b/roles/ensure_fail2ban/meta/main.yml new file mode 100644 index 0000000..446d07e --- /dev/null +++ b/roles/ensure_fail2ban/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: ensure_os_patch diff --git a/roles/ensure_fail2ban/tasks/main.yml b/roles/ensure_fail2ban/tasks/main.yml new file mode 100644 index 0000000..701b8a2 --- /dev/null +++ b/roles/ensure_fail2ban/tasks/main.yml @@ -0,0 +1,130 @@ +--- +# tasks file for ensure_fail2ban +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] + ansible.builtin.include_vars: + file: '{{ lookup("first_found", findme) }}' + name: ensure_fail2ban + vars: + findme: + files: + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' + - '{{ ansible_facts["distribution"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' + - '{{ ansible_facts["os_family"] }}-default.yml' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery + when: + - ansible_facts["system"] == 'Linux' + - ansible_facts["packages"] is not defined + ansible.builtin.package_facts: +- name: service discovery + when: + - ansible_facts["system"] == 'Linux' + - ansible_facts["services"] is not defined + ansible.builtin.service_facts: +- name: ensure packages + when: + - ansible_facts["system"] == 'Linux' + - ensure_fail2ban is defined + - ensure_fail2ban.package_list is defined + - ensure_fail2ban.package_list is iterable + ansible.builtin.package: + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_fail2ban.package_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: [ensure_fail2ban.package_facts, ensure_fail2ban.service_facts] +- name: ensure configurations + when: + - ansible_facts["system"] == 'Linux' + - ensure_fail2ban is defined + - ensure_fail2ban.template_list is defined + - ensure_fail2ban.template_list is iterable + ansible.builtin.template: + backup: 'no' + dest: '{{ item.dest }}' + group: '{{ item.group | default(omit) }}' + mode: '{{ item.mode | default(omit) }}' + owner: '{{ item.owner | default(omit) }}' + selevel: '{{ item.selevel | default(omit) }}' + serole: '{{ item.serole | default(omit) }}' + setype: '{{ item.setype | default(omit) }}' + seuser: '{{ item.seuser | default(omit) }}' + src: '{{ item.src }}' + loop: '{{ ensure_fail2ban.template_list }}' + loop_control: + label: '{{ item.dest }} will be ensured' + notify: + - ensure_fail2ban.package_facts + - ensure_fail2ban.service_facts + - ensure_fail2ban.service_reload + - ensure_fail2ban.service_restart +- name: ensure services + when: + - ansible_facts["system"] == 'Linux' + - ensure_fail2ban is defined + - ensure_fail2ban.service_list is defined + - ensure_fail2ban.service_list is iterable + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_fail2ban.service_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: [ensure_fail2ban.package_facts, ensure_fail2ban.service_facts] +- name: Ensure SELinux is configured + when: + - ansible_facts["system"] == 'Linux' + - ensure_fail2ban is defined + - ensure_fail2ban.selinux_policy is defined + - ensure_fail2ban.selinux_state is defined + ansible.posix.selinux: + policy: '{{ ensure_fail2ban.selinux_policy }}' + state: '{{ ensure_fail2ban.selinux_state }}' + register: ensure_fail2ban_results + notify: + - ensure_fail2ban.package_facts + - ensure_fail2ban.service_facts + - ensure_fail2ban.service_reload + - ensure_fail2ban.service_restart +- name: Reboot if required + when: + - ansible_facts["system"] == 'Linux' + - ensure_fail2ban is defined + - ensure_fail2ban.selinux_policy is defined + - ensure_fail2ban.selinux_state is defined + - ensure_fail2ban_results is defined + - ensure_fail2ban_results.reboot_required is defined + - ensure_fail2ban_results.reboot_required + ansible.builtin.reboot: +- name: ensure seboolean + when: + - ansible_facts["system"] == 'Linux' + - ensure_fail2ban is defined + - ensure_fail2ban.seboolean_list is defined + - ensure_fail2ban.seboolean_list is iterable + ansible.posix.seboolean: + name: '{{ item.name }}' + persistent: '{{ item.persistent }}' + state: '{{ item.state }}' + loop: '{{ ensure_fail2ban.seboolean_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - ensure_fail2ban.package_facts + - ensure_fail2ban.service_facts + - ensure_fail2ban.service_reload + - ensure_fail2ban.service_restart +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_fail2ban/templates/Debian/11/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Debian/11/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..c1b5aea --- /dev/null +++ b/roles/ensure_fail2ban/templates/Debian/11/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = iptables-multiport +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/templates/Debian/12/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Debian/12/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..c1b5aea --- /dev/null +++ b/roles/ensure_fail2ban/templates/Debian/12/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = iptables-multiport +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/templates/Debian/13/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Debian/13/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..c1b5aea --- /dev/null +++ b/roles/ensure_fail2ban/templates/Debian/13/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = iptables-multiport +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/templates/Fedora/43/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Fedora/43/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..1a2a5f5 --- /dev/null +++ b/roles/ensure_fail2ban/templates/Fedora/43/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = firewallcmd-rich-rules +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/templates/Fedora/44/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Fedora/44/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..1a2a5f5 --- /dev/null +++ b/roles/ensure_fail2ban/templates/Fedora/44/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = firewallcmd-rich-rules +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/templates/Ubuntu/22/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Ubuntu/22/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..c1b5aea --- /dev/null +++ b/roles/ensure_fail2ban/templates/Ubuntu/22/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = iptables-multiport +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/templates/Ubuntu/24/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Ubuntu/24/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..c1b5aea --- /dev/null +++ b/roles/ensure_fail2ban/templates/Ubuntu/24/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = iptables-multiport +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/templates/Ubuntu/26/etc/fail2ban/jail.d/99-custom_jails.conf.j2 b/roles/ensure_fail2ban/templates/Ubuntu/26/etc/fail2ban/jail.d/99-custom_jails.conf.j2 new file mode 100644 index 0000000..c1b5aea --- /dev/null +++ b/roles/ensure_fail2ban/templates/Ubuntu/26/etc/fail2ban/jail.d/99-custom_jails.conf.j2 @@ -0,0 +1,37 @@ +# Default block/ban configuration +[DEFAULT] +bantime = 1h +findtime = 10m +maxretry = 5 +banaction = iptables-multiport +backend = systemd + +# SSH is enabled on all servers +[sshd] +enabled = true + +# Apache +[apache-auth] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-badbots] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-noscript] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +[apache-overflows] +enabled = {{ 'true' if ('httpd' in ansible_facts.packages or 'apache2' in ansible_facts.packages) else 'false' }} + +# Postfix +[postfix] +enabled = {{ 'true' if 'postfix' in ansible_facts.packages else 'false' }} + +# Dovecot +[dovecot] +enabled = {{ 'true' if 'dovecot' in ansible_facts.packages or 'dovecot-core' in ansible_facts.packages else 'false' }} + +# MariaDB / MySQL +[mysqld-auth] +enabled = {{ 'true' if ('mariadb-server' in ansible_facts.packages or 'mariadb' in ansible_facts.packages or 'mysql-server' in ansible_facts.packages) else 'false' }} + diff --git a/roles/ensure_fail2ban/vars/Debian-11-default.yml b/roles/ensure_fail2ban/vars/Debian-11-default.yml new file mode 100644 index 0000000..2f030ca --- /dev/null +++ b/roles/ensure_fail2ban/vars/Debian-11-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/Debian-12-default.yml b/roles/ensure_fail2ban/vars/Debian-12-default.yml new file mode 100644 index 0000000..2f030ca --- /dev/null +++ b/roles/ensure_fail2ban/vars/Debian-12-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/Debian-13-default.yml b/roles/ensure_fail2ban/vars/Debian-13-default.yml new file mode 100644 index 0000000..2f030ca --- /dev/null +++ b/roles/ensure_fail2ban/vars/Debian-13-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/Fedora-43-default.yml b/roles/ensure_fail2ban/vars/Fedora-43-default.yml new file mode 100644 index 0000000..bf69fae --- /dev/null +++ b/roles/ensure_fail2ban/vars/Fedora-43-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban-all + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/Fedora-44-default.yml b/roles/ensure_fail2ban/vars/Fedora-44-default.yml new file mode 100644 index 0000000..bf69fae --- /dev/null +++ b/roles/ensure_fail2ban/vars/Fedora-44-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban-all + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/Ubuntu-22-default.yml b/roles/ensure_fail2ban/vars/Ubuntu-22-default.yml new file mode 100644 index 0000000..2f030ca --- /dev/null +++ b/roles/ensure_fail2ban/vars/Ubuntu-22-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/Ubuntu-24-default.yml b/roles/ensure_fail2ban/vars/Ubuntu-24-default.yml new file mode 100644 index 0000000..2f030ca --- /dev/null +++ b/roles/ensure_fail2ban/vars/Ubuntu-24-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/Ubuntu-26-default.yml b/roles/ensure_fail2ban/vars/Ubuntu-26-default.yml new file mode 100644 index 0000000..2f030ca --- /dev/null +++ b/roles/ensure_fail2ban/vars/Ubuntu-26-default.yml @@ -0,0 +1,16 @@ +--- +# vars file for ensure_fail2ban +package_list: + - name: fail2ban + state: present +service_list: + - name: fail2ban + state: started + enabled: true +template_list: + - dest: /etc/fail2ban/jail.d/99-custom_jails.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/fail2ban/jail.d/99-custom_jails.conf.j2' + owner: root + group: root + mode: '0644' diff --git a/roles/ensure_fail2ban/vars/default.yml b/roles/ensure_fail2ban/vars/default.yml new file mode 100644 index 0000000..91da2a7 --- /dev/null +++ b/roles/ensure_fail2ban/vars/default.yml @@ -0,0 +1,2 @@ +--- +... diff --git a/roles/ensure_fail2ban/vars/main.yml b/roles/ensure_fail2ban/vars/main.yml new file mode 100644 index 0000000..91da2a7 --- /dev/null +++ b/roles/ensure_fail2ban/vars/main.yml @@ -0,0 +1,2 @@ +--- +... diff --git a/roles/ensure_git/.travis.yml b/roles/ensure_git/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_git/.travis.yml +++ b/roles/ensure_git/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_git/defaults/main.yml b/roles/ensure_git/defaults/main.yml index 5c13a03..91da2a7 100644 --- a/roles/ensure_git/defaults/main.yml +++ b/roles/ensure_git/defaults/main.yml @@ -1,3 +1,2 @@ --- -# defaults file for ensure_git - +... diff --git a/roles/ensure_git/handlers/main.yml b/roles/ensure_git/handlers/main.yml index 691ebaf..b3ca86e 100644 --- a/roles/ensure_git/handlers/main.yml +++ b/roles/ensure_git/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_git -- name: 'ensure_git.package_facts' +- name: ensure_git.package_facts ansible.builtin.package_facts: -- name: 'ensure_git.service_facts' +- name: ensure_git.service_facts ansible.builtin.service_facts: -- name: 'ensure_git.service_reload' +- name: ensure_git.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_git is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_git.service_restart' +- name: ensure_git.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_git is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_git.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_git/meta/main.yml b/roles/ensure_git/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_git/meta/main.yml +++ b/roles/ensure_git/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_git/tasks/main.yml b/roles/ensure_git/tasks/main.yml index 270458b..6cfb68f 100644 --- a/roles/ensure_git/tasks/main.yml +++ b/roles/ensure_git/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_git -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_git' + name: ensure_git vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_git is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_git.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_git.package_facts' - - 'ensure_git.service_facts' -- name: 'ensure configurations' + notify: [ensure_git.package_facts, ensure_git.service_facts] +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_git is defined @@ -65,11 +65,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_git.package_facts' - - 'ensure_git.service_facts' - - 'ensure_git.service_reload' - - 'ensure_git.service_restart' -- name: 'ensure services' + - ensure_git.package_facts + - ensure_git.service_facts + - ensure_git.service_reload + - ensure_git.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_git is defined @@ -82,10 +82,8 @@ loop: '{{ ensure_git.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_git.package_facts' - - 'ensure_git.service_facts' -- name: 'Ensure SELinux is configured' + notify: [ensure_git.package_facts, ensure_git.service_facts] +- name: Ensure SELinux is configured when: - ansible_facts["system"] == 'Linux' - ensure_git is defined @@ -94,13 +92,13 @@ ansible.posix.selinux: policy: '{{ ensure_git.selinux_policy }}' state: '{{ ensure_git.selinux_state }}' - register: 'results' + register: results notify: - - 'ensure_git.package_facts' - - 'ensure_git.service_facts' - - 'ensure_git.service_reload' - - 'ensure_git.service_restart' -- name: 'Reboot if required' + - ensure_git.package_facts + - ensure_git.service_facts + - ensure_git.service_reload + - ensure_git.service_restart +- name: Reboot if required when: - ansible_facts["system"] == 'Linux' - ensure_git is defined @@ -110,7 +108,7 @@ - results.reboot_required is defined - results.reboot_required reboot: -- name: 'ensure seboolean' +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_git is defined @@ -124,11 +122,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_git.package_facts' - - 'ensure_git.service_facts' - - 'ensure_git.service_reload' - - 'ensure_git.service_restart' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + - ensure_git.package_facts + - ensure_git.service_facts + - ensure_git.service_reload + - ensure_git.service_restart +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_git/tests/test.yml b/roles/ensure_git/tests/test.yml index 2b3af09..0b2bb40 100644 --- a/roles/ensure_git/tests/test.yml +++ b/roles/ensure_git/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_git \ No newline at end of file + roles: [ensure_git] diff --git a/roles/ensure_git/vars/AlmaLinux-10-default.yml b/roles/ensure_git/vars/AlmaLinux-10-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_git/vars/AlmaLinux-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/AlmaLinux-9-default.yml b/roles/ensure_git/vars/AlmaLinux-9-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_git/vars/AlmaLinux-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/CentOS-10-default.yml b/roles/ensure_git/vars/CentOS-10-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/CentOS-10-default.yml +++ b/roles/ensure_git/vars/CentOS-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/CentOS-9-default.yml b/roles/ensure_git/vars/CentOS-9-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/CentOS-9-default.yml +++ b/roles/ensure_git/vars/CentOS-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Debian-11-default.yml b/roles/ensure_git/vars/Debian-11-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Debian-11-default.yml +++ b/roles/ensure_git/vars/Debian-11-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Debian-12-default.yml b/roles/ensure_git/vars/Debian-12-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Debian-12-default.yml +++ b/roles/ensure_git/vars/Debian-12-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Debian-13-default.yml b/roles/ensure_git/vars/Debian-13-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Debian-13-default.yml +++ b/roles/ensure_git/vars/Debian-13-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Fedora-42-default.yml b/roles/ensure_git/vars/Fedora-42-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Fedora-42-default.yml +++ b/roles/ensure_git/vars/Fedora-42-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Fedora-43-default.yml b/roles/ensure_git/vars/Fedora-43-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Fedora-43-default.yml +++ b/roles/ensure_git/vars/Fedora-43-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Fedora-44-default.yml b/roles/ensure_git/vars/Fedora-44-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Fedora-44-default.yml +++ b/roles/ensure_git/vars/Fedora-44-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/OracleLinux-10-default.yml b/roles/ensure_git/vars/OracleLinux-10-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/OracleLinux-10-default.yml +++ b/roles/ensure_git/vars/OracleLinux-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/OracleLinux-9-default.yml b/roles/ensure_git/vars/OracleLinux-9-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/OracleLinux-9-default.yml +++ b/roles/ensure_git/vars/OracleLinux-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Rocky-10-default.yml b/roles/ensure_git/vars/Rocky-10-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Rocky-10-default.yml +++ b/roles/ensure_git/vars/Rocky-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Rocky-9-default.yml b/roles/ensure_git/vars/Rocky-9-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Rocky-9-default.yml +++ b/roles/ensure_git/vars/Rocky-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Ubuntu-22-default.yml b/roles/ensure_git/vars/Ubuntu-22-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Ubuntu-22-default.yml +++ b/roles/ensure_git/vars/Ubuntu-22-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Ubuntu-24-default.yml b/roles/ensure_git/vars/Ubuntu-24-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Ubuntu-24-default.yml +++ b/roles/ensure_git/vars/Ubuntu-24-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/Ubuntu-26-default.yml b/roles/ensure_git/vars/Ubuntu-26-default.yml index 3eb8a23..c05f634 100644 --- a/roles/ensure_git/vars/Ubuntu-26-default.yml +++ b/roles/ensure_git/vars/Ubuntu-26-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git' - state: 'present' -... - + - name: git + state: present diff --git a/roles/ensure_git/vars/default.yml b/roles/ensure_git/vars/default.yml index 2406aff..91da2a7 100644 --- a/roles/ensure_git/vars/default.yml +++ b/roles/ensure_git/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_git \ No newline at end of file +... diff --git a/roles/ensure_git/vars/main.yml b/roles/ensure_git/vars/main.yml index 8b29a93..91da2a7 100644 --- a/roles/ensure_git/vars/main.yml +++ b/roles/ensure_git/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_git +... diff --git a/roles/ensure_gitea/defaults/main.yml b/roles/ensure_gitea/defaults/main.yml index 9ee0065..762e53f 100644 --- a/roles/ensure_gitea/defaults/main.yml +++ b/roles/ensure_gitea/defaults/main.yml @@ -1,8 +1,7 @@ --- # defaults file for ensure_gitea -gitea_database_type: 'mysql' -gitea_database_host: 'localhost:3306' -gitea_database_name: 'gitea' -gitea_database_user: 'gitea' -gitea_database_pass: 'SuperSecretSquirrel' - +gitea_database_type: mysql +gitea_database_host: localhost:3306 +gitea_database_name: gitea +gitea_database_user: gitea +gitea_database_pass: SuperSecretSquirrel diff --git a/roles/ensure_gitea/handlers/main.yml b/roles/ensure_gitea/handlers/main.yml index f6ba09f..debe7dc 100644 --- a/roles/ensure_gitea/handlers/main.yml +++ b/roles/ensure_gitea/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_gitea -- name: 'ensure_gitea.package_facts' +- name: ensure_gitea.package_facts ansible.builtin.package_facts: -- name: 'ensure_gitea.service_facts' +- name: ensure_gitea.service_facts ansible.builtin.service_facts: -- name: 'ensure_gitea.service_reload' +- name: ensure_gitea.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_gitea is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_gitea.service_restart' +- name: ensure_gitea.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_gitea is defined @@ -21,8 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_gitea.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... diff --git a/roles/ensure_gitea/meta/main.yml b/roles/ensure_gitea/meta/main.yml index 60062bd..44682e9 100644 --- a/roles/ensure_gitea/meta/main.yml +++ b/roles/ensure_gitea/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Deploy MariaDB @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - diff --git a/roles/ensure_gitea/tasks/main.yml b/roles/ensure_gitea/tasks/main.yml index 792aa58..96bdfcc 100644 --- a/roles/ensure_gitea/tasks/main.yml +++ b/roles/ensure_gitea/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_gitea -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_gitea' + name: ensure_gitea vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure yum repository' +- name: ensure yum repository when: - ansible_facts["system"] == 'Linux' - ansible_facts["pkg_mgr"] == 'dnf' or ansible_facts["pkg_mgr"] == 'dnf5' @@ -88,11 +90,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_gitea.package_facts' - - 'ensure_gitea.service_facts' - - 'ensure_gitea.service_reload' - - 'ensure_gitea.service_restart' -- name: 'ensure sysctl' + - ensure_gitea.package_facts + - ensure_gitea.service_facts + - ensure_gitea.service_reload + - ensure_gitea.service_restart +- name: ensure sysctl when: - ansible_facts["system"] == 'Linux' - ensure_gitea is defined @@ -109,11 +111,11 @@ loop_control: label: '{{ item.name }} will be {{ item.value }}' notify: - - 'ensure_gitea.package_facts' - - 'ensure_gitea.service_facts' - - 'ensure_gitea.service_reload' - - 'ensure_gitea.service_restart' -- name: 'ensure packages' + - ensure_gitea.package_facts + - ensure_gitea.service_facts + - ensure_gitea.service_reload + - ensure_gitea.service_restart +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_gitea is defined @@ -126,11 +128,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_gitea.package_facts' - - 'ensure_gitea.service_facts' - - 'ensure_gitea.service_reload' - - 'ensure_gitea.service_restart' -- name: 'ensure seboolean' + - ensure_gitea.package_facts + - ensure_gitea.service_facts + - ensure_gitea.service_reload + - ensure_gitea.service_restart +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_gitea is defined @@ -144,11 +146,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_gitea.package_facts' - - 'ensure_gitea.service_facts' - - 'ensure_gitea.service_reload' - - 'ensure_gitea.service_restart' -- name: 'ensure configurations' + - ensure_gitea.package_facts + - ensure_gitea.service_facts + - ensure_gitea.service_reload + - ensure_gitea.service_restart +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_gitea is defined @@ -169,11 +171,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_gitea.package_facts' - - 'ensure_gitea.service_facts' - - 'ensure_gitea.service_reload' - - 'ensure_gitea.service_restart' -- name: 'ensure firewall' + - ensure_gitea.package_facts + - ensure_gitea.service_facts + - ensure_gitea.service_reload + - ensure_gitea.service_restart +- name: ensure firewall when: - ansible_facts["system"] == 'Linux' - ansible_facts.packages["firewalld"] is defined @@ -189,11 +191,11 @@ loop_control: label: '{{ item.service }} will be {{ item.state }}' notify: - - 'ensure_gitea.package_facts' - - 'ensure_gitea.service_facts' - - 'ensure_gitea.service_reload' - - 'ensure_gitea.service_restart' -- name: 'ensure services' + - ensure_gitea.package_facts + - ensure_gitea.service_facts + - ensure_gitea.service_reload + - ensure_gitea.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_gitea is defined @@ -207,11 +209,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_gitea.package_facts' - - 'ensure_gitea.service_facts' - - 'ensure_gitea.service_reload' - - 'ensure_gitea.service_restart' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + - ensure_gitea.package_facts + - ensure_gitea.service_facts + - ensure_gitea.service_reload + - ensure_gitea.service_restart +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_gitea/tests/test.yml b/roles/ensure_gitea/tests/test.yml index e9dae0c..476da97 100644 --- a/roles/ensure_gitea/tests/test.yml +++ b/roles/ensure_gitea/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_gitea \ No newline at end of file + roles: [ensure_gitea] diff --git a/roles/ensure_gitea/vars/Fedora-42-default.yml b/roles/ensure_gitea/vars/Fedora-42-default.yml index e49609b..5f333e8 100644 --- a/roles/ensure_gitea/vars/Fedora-42-default.yml +++ b/roles/ensure_gitea/vars/Fedora-42-default.yml @@ -1,19 +1,18 @@ --- # vars file for ensure_gitea package_list: - - name: 'gitea' - state: 'present' + - name: gitea + state: present service_list: - - name: 'gitea.service' - state: 'started' + - name: gitea.service + state: started enabled: 'yes' yum_repository_list: - - name: 'gitea-fedorapackages-fedora' - baseurl: 'https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/' - description: 'FedoraPackages - Fire Dragon GIT Repository - fedora - {{ ansible_facts.distribution_major_version }} - {{ ansible_facts.architecture }}' + - name: gitea-fedorapackages-fedora + baseurl: https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/ + description: FedoraPackages - Fire Dragon GIT Repository - fedora - {{ ansible_facts.distribution_major_version }} + - {{ ansible_facts.architecture }} enabled: true gpgcheck: false - gpgkey: 'https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/repository.key' - state: 'present' -... - + gpgkey: https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/repository.key + state: present diff --git a/roles/ensure_gitea/vars/Fedora-43-default.yml b/roles/ensure_gitea/vars/Fedora-43-default.yml index e49609b..5f333e8 100644 --- a/roles/ensure_gitea/vars/Fedora-43-default.yml +++ b/roles/ensure_gitea/vars/Fedora-43-default.yml @@ -1,19 +1,18 @@ --- # vars file for ensure_gitea package_list: - - name: 'gitea' - state: 'present' + - name: gitea + state: present service_list: - - name: 'gitea.service' - state: 'started' + - name: gitea.service + state: started enabled: 'yes' yum_repository_list: - - name: 'gitea-fedorapackages-fedora' - baseurl: 'https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/' - description: 'FedoraPackages - Fire Dragon GIT Repository - fedora - {{ ansible_facts.distribution_major_version }} - {{ ansible_facts.architecture }}' + - name: gitea-fedorapackages-fedora + baseurl: https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/ + description: FedoraPackages - Fire Dragon GIT Repository - fedora - {{ ansible_facts.distribution_major_version }} + - {{ ansible_facts.architecture }} enabled: true gpgcheck: false - gpgkey: 'https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/repository.key' - state: 'present' -... - + gpgkey: https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/repository.key + state: present diff --git a/roles/ensure_gitea/vars/Fedora-44-default.yml b/roles/ensure_gitea/vars/Fedora-44-default.yml index e49609b..5f333e8 100644 --- a/roles/ensure_gitea/vars/Fedora-44-default.yml +++ b/roles/ensure_gitea/vars/Fedora-44-default.yml @@ -1,19 +1,18 @@ --- # vars file for ensure_gitea package_list: - - name: 'gitea' - state: 'present' + - name: gitea + state: present service_list: - - name: 'gitea.service' - state: 'started' + - name: gitea.service + state: started enabled: 'yes' yum_repository_list: - - name: 'gitea-fedorapackages-fedora' - baseurl: 'https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/' - description: 'FedoraPackages - Fire Dragon GIT Repository - fedora - {{ ansible_facts.distribution_major_version }} - {{ ansible_facts.architecture }}' + - name: gitea-fedorapackages-fedora + baseurl: https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/ + description: FedoraPackages - Fire Dragon GIT Repository - fedora - {{ ansible_facts.distribution_major_version }} + - {{ ansible_facts.architecture }} enabled: true gpgcheck: false - gpgkey: 'https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/repository.key' - state: 'present' -... - + gpgkey: https://gitea.fdragon.com/api/packages/Fedora-fc$releasever/rpm/repository.key + state: present diff --git a/roles/ensure_gitea/vars/default.yml b/roles/ensure_gitea/vars/default.yml index 68687c5..91da2a7 100644 --- a/roles/ensure_gitea/vars/default.yml +++ b/roles/ensure_gitea/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_gitea \ No newline at end of file +... diff --git a/roles/ensure_gitea/vars/main.yml b/roles/ensure_gitea/vars/main.yml index 68687c5..91da2a7 100644 --- a/roles/ensure_gitea/vars/main.yml +++ b/roles/ensure_gitea/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_gitea \ No newline at end of file +... diff --git a/roles/ensure_hostname/defaults/main.yml b/roles/ensure_hostname/defaults/main.yml index be745e4..91da2a7 100644 --- a/roles/ensure_hostname/defaults/main.yml +++ b/roles/ensure_hostname/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_hostname +... diff --git a/roles/ensure_hostname/handlers/main.yml b/roles/ensure_hostname/handlers/main.yml index 4f2bfdb..91da2a7 100644 --- a/roles/ensure_hostname/handlers/main.yml +++ b/roles/ensure_hostname/handlers/main.yml @@ -1,2 +1,2 @@ --- -# handlers file for ensure_hostname +... diff --git a/roles/ensure_hostname/meta/main.yml b/roles/ensure_hostname/meta/main.yml index c572acc..5d7099b 100644 --- a/roles/ensure_hostname/meta/main.yml +++ b/roles/ensure_hostname/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.1 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,7 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. diff --git a/roles/ensure_hostname/tasks/main.yml b/roles/ensure_hostname/tasks/main.yml index ff0689d..f88c2de 100644 --- a/roles/ensure_hostname/tasks/main.yml +++ b/roles/ensure_hostname/tasks/main.yml @@ -1,10 +1,8 @@ --- # tasks file for ensure_hostname -- name: 'Set hostname if localhost' +- name: Set hostname if localhost when: - ansible_facts["system"] == 'Linux' - ansible_facts["fqdn"] == 'localhost.localdomain' ansible.builtin.hostname: name: '{{ inventory_hostname }}' -... - diff --git a/roles/ensure_hostname/tests/test.yml b/roles/ensure_hostname/tests/test.yml index 7f6a810..a557223 100644 --- a/roles/ensure_hostname/tests/test.yml +++ b/roles/ensure_hostname/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_hostname + roles: [ensure_hostname] diff --git a/roles/ensure_hostname/vars/main.yml b/roles/ensure_hostname/vars/main.yml index c11b0d6..91da2a7 100644 --- a/roles/ensure_hostname/vars/main.yml +++ b/roles/ensure_hostname/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_hostname +... diff --git a/roles/ensure_log_rotation/.travis.yml b/roles/ensure_log_rotation/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_log_rotation/.travis.yml +++ b/roles/ensure_log_rotation/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_log_rotation/handlers/main.yml b/roles/ensure_log_rotation/handlers/main.yml index 7f87233..5297165 100644 --- a/roles/ensure_log_rotation/handlers/main.yml +++ b/roles/ensure_log_rotation/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_log_rotation -- name: 'ensure_log_rotation.package_facts' +- name: ensure_log_rotation.package_facts ansible.builtin.package_facts: -- name: 'ensure_log_rotation.service_facts' +- name: ensure_log_rotation.service_facts ansible.builtin.service_facts: -- name: 'ensure_log_rotation.service_reload' +- name: ensure_log_rotation.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_log_rotation is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_log_rotation.service_restart' +- name: ensure_log_rotation.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_log_rotation is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_log_rotation.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_log_rotation/meta/main.yml b/roles/ensure_log_rotation/meta/main.yml index 8df487c..8d24b58 100644 --- a/roles/ensure_log_rotation/meta/main.yml +++ b/roles/ensure_log_rotation/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensure default log retention and rotation policy is applied @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_log_rotation/tasks/main.yml b/roles/ensure_log_rotation/tasks/main.yml index c831893..7c0d122 100644 --- a/roles/ensure_log_rotation/tasks/main.yml +++ b/roles/ensure_log_rotation/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_log_rotation -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_log_rotation' + name: ensure_log_rotation vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_log_rotation is defined @@ -42,9 +44,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_log_rotation.package_facts' - - 'ensure_log_rotation.service_facts' -- name: 'ensure configuration' + - ensure_log_rotation.package_facts + - ensure_log_rotation.service_facts +- name: ensure configuration when: - ansible_facts["system"] == 'Linux' - ensure_log_rotation is defined @@ -69,11 +71,11 @@ loop_control: label: '{{ item.dest }}' notify: - - 'ensure_log_rotation.package_facts' - - 'ensure_log_rotation.service_facts' - - 'ensure_log_rotation.service_reload' - - 'ensure_log_rotation.service_restart' -- name: 'ensure services' + - ensure_log_rotation.package_facts + - ensure_log_rotation.service_facts + - ensure_log_rotation.service_reload + - ensure_log_rotation.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_log_rotation is defined @@ -87,8 +89,7 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_log_rotation.package_facts' - - 'ensure_log_rotation.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' - + - ensure_log_rotation.package_facts + - ensure_log_rotation.service_facts +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_log_rotation/tests/test.yml b/roles/ensure_log_rotation/tests/test.yml index 2509be1..81f7e04 100644 --- a/roles/ensure_log_rotation/tests/test.yml +++ b/roles/ensure_log_rotation/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_log_rotation \ No newline at end of file + roles: [ensure_log_rotation] diff --git a/roles/ensure_log_rotation/vars/AlmaLinux-10-default.yml b/roles/ensure_log_rotation/vars/AlmaLinux-10-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_log_rotation/vars/AlmaLinux-10-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/AlmaLinux-9-default.yml b/roles/ensure_log_rotation/vars/AlmaLinux-9-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_log_rotation/vars/AlmaLinux-9-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/CentOS-10-default.yml b/roles/ensure_log_rotation/vars/CentOS-10-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/CentOS-10-default.yml +++ b/roles/ensure_log_rotation/vars/CentOS-10-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/CentOS-9-default.yml b/roles/ensure_log_rotation/vars/CentOS-9-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/CentOS-9-default.yml +++ b/roles/ensure_log_rotation/vars/CentOS-9-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/Fedora-42-default.yml b/roles/ensure_log_rotation/vars/Fedora-42-default.yml index 70e32c5..ffefca8 100644 --- a/roles/ensure_log_rotation/vars/Fedora-42-default.yml +++ b/roles/ensure_log_rotation/vars/Fedora-42-default.yml @@ -1,29 +1,31 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present service_list: - - name: 'logrotate.timer' - state: 'started' + - name: logrotate.timer + state: started enabled: 'yes' template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/Fedora-43-default.yml b/roles/ensure_log_rotation/vars/Fedora-43-default.yml index 70e32c5..ffefca8 100644 --- a/roles/ensure_log_rotation/vars/Fedora-43-default.yml +++ b/roles/ensure_log_rotation/vars/Fedora-43-default.yml @@ -1,29 +1,31 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present service_list: - - name: 'logrotate.timer' - state: 'started' + - name: logrotate.timer + state: started enabled: 'yes' template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/Fedora-44-default.yml b/roles/ensure_log_rotation/vars/Fedora-44-default.yml index 70e32c5..ffefca8 100644 --- a/roles/ensure_log_rotation/vars/Fedora-44-default.yml +++ b/roles/ensure_log_rotation/vars/Fedora-44-default.yml @@ -1,29 +1,31 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present service_list: - - name: 'logrotate.timer' - state: 'started' + - name: logrotate.timer + state: started enabled: 'yes' template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/OracleLinux-10-default.yml b/roles/ensure_log_rotation/vars/OracleLinux-10-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/OracleLinux-10-default.yml +++ b/roles/ensure_log_rotation/vars/OracleLinux-10-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/OracleLinux-9-default.yml b/roles/ensure_log_rotation/vars/OracleLinux-9-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/OracleLinux-9-default.yml +++ b/roles/ensure_log_rotation/vars/OracleLinux-9-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/Rocky-10-default.yml b/roles/ensure_log_rotation/vars/Rocky-10-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/Rocky-10-default.yml +++ b/roles/ensure_log_rotation/vars/Rocky-10-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/Rocky-9-default.yml b/roles/ensure_log_rotation/vars/Rocky-9-default.yml index f5f2077..7745b91 100644 --- a/roles/ensure_log_rotation/vars/Rocky-9-default.yml +++ b/roles/ensure_log_rotation/vars/Rocky-9-default.yml @@ -1,25 +1,27 @@ --- # vars file for ensure_log_rotation package_list: - - name: 'logrotate' - state: 'present' + - name: logrotate + state: present template_list: - - dest: '/etc/logrotate.conf' + - dest: /etc/logrotate.conf force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.conf' + - dest: /etc/logrotate.d/btmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/btmp' + - dest: /etc/logrotate.d/wtmp force: 'yes' - group: 'root' + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/logrotate.d/wtmp' - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/logrotate.d/wtmp' diff --git a/roles/ensure_log_rotation/vars/default.yml b/roles/ensure_log_rotation/vars/default.yml index ad37505..91da2a7 100644 --- a/roles/ensure_log_rotation/vars/default.yml +++ b/roles/ensure_log_rotation/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_log_rotation \ No newline at end of file +... diff --git a/roles/ensure_log_rotation/vars/main.yml b/roles/ensure_log_rotation/vars/main.yml index ad37505..91da2a7 100644 --- a/roles/ensure_log_rotation/vars/main.yml +++ b/roles/ensure_log_rotation/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_log_rotation \ No newline at end of file +... diff --git a/roles/ensure_mariadb/.travis.yml b/roles/ensure_mariadb/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_mariadb/.travis.yml +++ b/roles/ensure_mariadb/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_mariadb/handlers/main.yml b/roles/ensure_mariadb/handlers/main.yml index b0d3a2a..3aa0b0f 100644 --- a/roles/ensure_mariadb/handlers/main.yml +++ b/roles/ensure_mariadb/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_mariadb -- name: 'ensure_mariadb.package_facts' +- name: ensure_mariadb.package_facts ansible.builtin.package_facts: -- name: 'ensure_mariadb.service_facts' +- name: ensure_mariadb.service_facts ansible.builtin.service_facts: -- name: 'ensure_mariadb.service_reload' +- name: ensure_mariadb.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_mariadb is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_mariadb.service_restart' +- name: ensure_mariadb.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_mariadb is defined @@ -21,8 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_mariadb.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... diff --git a/roles/ensure_mariadb/meta/main.yml b/roles/ensure_mariadb/meta/main.yml index 60062bd..44682e9 100644 --- a/roles/ensure_mariadb/meta/main.yml +++ b/roles/ensure_mariadb/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Deploy MariaDB @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - diff --git a/roles/ensure_mariadb/tasks/main.yml b/roles/ensure_mariadb/tasks/main.yml index 532baae..758f521 100644 --- a/roles/ensure_mariadb/tasks/main.yml +++ b/roles/ensure_mariadb/tasks/main.yml @@ -1,116 +1,118 @@ --- # tasks file for ensure_mariadb -- name: "include variables" - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: "ensure_mariadb" + name: ensure_mariadb vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - "default.yml" - paths: - - "../vars/" - errors: "ignore" -- name: "package discovery" + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: "service discovery" +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: "ensure sysctl" +- name: ensure sysctl when: - ansible_facts["system"] == 'Linux' - ensure_mariadb is defined - ensure_mariadb.sysctl_list is defined - ensure_mariadb.sysctl_list is iterable ansible.posix.sysctl: - name: "{{ item.name }}" - reload: "{{ item.reload | default(omit) }}" - state: "{{ item.state }}" - sysctl_file: "{{ item.sysctl_file | default(omit) }}" - sysctl_set: "{{ item.sysctl_set | default(omit) }}" - value: "{{ item.value | default(omit) }}" - loop: "{{ ensure_mariadb.sysctl_list }}" + name: '{{ item.name }}' + reload: '{{ item.reload | default(omit) }}' + state: '{{ item.state }}' + sysctl_file: '{{ item.sysctl_file | default(omit) }}' + sysctl_set: '{{ item.sysctl_set | default(omit) }}' + value: '{{ item.value | default(omit) }}' + loop: '{{ ensure_mariadb.sysctl_list }}' loop_control: - label: "{{ item.name }} will be {{ item.value }}" + label: '{{ item.name }} will be {{ item.value }}' notify: - - "ensure_mariadb.package_facts" - - "ensure_mariadb.service_facts" - - "ensure_mariadb.service_reload" - - "ensure_mariadb.service_restart" -- name: "ensure packages" + - ensure_mariadb.package_facts + - ensure_mariadb.service_facts + - ensure_mariadb.service_reload + - ensure_mariadb.service_restart +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_mariadb is defined - ensure_mariadb.package_list is defined - ensure_mariadb.package_list is iterable ansible.builtin.package: - name: "{{ item.name }}" - state: "{{ item.state }}" - loop: "{{ ensure_mariadb.package_list }}" + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_mariadb.package_list }}' loop_control: - label: "{{ item.name }} will be {{ item.state }}" + label: '{{ item.name }} will be {{ item.state }}' notify: - - "ensure_mariadb.package_facts" - - "ensure_mariadb.service_facts" - - "ensure_mariadb.service_reload" - - "ensure_mariadb.service_restart" -- name: "ensure seboolean" + - ensure_mariadb.package_facts + - ensure_mariadb.service_facts + - ensure_mariadb.service_reload + - ensure_mariadb.service_restart +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_mariadb is defined - ensure_mariadb.seboolean_list is defined - ensure_mariadb.seboolean_list is iterable ansible.posix.seboolean: - name: "{{ item.name }}" - persistent: "{{ item.persistent }}" - state: "{{ item.state }}" - loop: "{{ ensure_mariadb.seboolean_list }}" + name: '{{ item.name }}' + persistent: '{{ item.persistent }}' + state: '{{ item.state }}' + loop: '{{ ensure_mariadb.seboolean_list }}' loop_control: - label: "{{ item.name }} will be {{ item.state }}" + label: '{{ item.name }} will be {{ item.state }}' notify: - - "ensure_mariadb.package_facts" - - "ensure_mariadb.service_facts" - - "ensure_mariadb.service_reload" - - "ensure_mariadb.service_restart" -- name: "ensure configurations" + - ensure_mariadb.package_facts + - ensure_mariadb.service_facts + - ensure_mariadb.service_reload + - ensure_mariadb.service_restart +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_mariadb is defined - ensure_mariadb.template_list is defined - ensure_mariadb.template_list is iterable ansible.builtin.template: - backup: "no" - dest: "{{ item.dest }}" - group: "{{ item.group | default(omit) }}" - mode: "{{ item.mode | default(omit) }}" - owner: "{{ item.owner | default(omit) }}" - selevel: "{{ iteml.selevel | default(omit) }}" - serole: "{{ item.serole | default(omit) }}" - setype: "{{ item.setype | default(omit) }}" - seuser: "{{ item.seuser | default(omit) }}" - src: "{{ item.src }}" - loop: "{{ ensure_mariadb.template_list }}" + backup: 'no' + dest: '{{ item.dest }}' + group: '{{ item.group | default(omit) }}' + mode: '{{ item.mode | default(omit) }}' + owner: '{{ item.owner | default(omit) }}' + selevel: '{{ iteml.selevel | default(omit) }}' + serole: '{{ item.serole | default(omit) }}' + setype: '{{ item.setype | default(omit) }}' + seuser: '{{ item.seuser | default(omit) }}' + src: '{{ item.src }}' + loop: '{{ ensure_mariadb.template_list }}' loop_control: - label: "{{ item.dest }} will be ensured" + label: '{{ item.dest }} will be ensured' notify: - - "ensure_mariadb.package_facts" - - "ensure_mariadb.service_facts" - - "ensure_mariadb.service_reload" - - "ensure_mariadb.service_restart" -- name: "ensure firewall" + - ensure_mariadb.package_facts + - ensure_mariadb.service_facts + - ensure_mariadb.service_reload + - ensure_mariadb.service_restart +- name: ensure firewall when: - ansible_facts["system"] == 'Linux' - ansible_facts.packages["firewalld"] is defined @@ -119,117 +121,112 @@ - ensure_mariadb.firewall_list is defined - ensure_mariadb.firewall_list is iterable ansible.posix.firewalld: - permanent: "{{ item.permanent }}" - service: "{{ item.service }}" - state: "{{ item.state }}" - loop: "{{ ensure_mariadb.firewall_list }}" + permanent: '{{ item.permanent }}' + service: '{{ item.service }}' + state: '{{ item.state }}' + loop: '{{ ensure_mariadb.firewall_list }}' loop_control: - label: "{{ item.service }} will be {{ item.state }}" + label: '{{ item.service }} will be {{ item.state }}' notify: - - "ensure_mariadb.package_facts" - - "ensure_mariadb.service_facts" - - "ensure_mariadb.service_reload" - - "ensure_mariadb.service_restart" -- name: "ensure services" + - ensure_mariadb.package_facts + - ensure_mariadb.service_facts + - ensure_mariadb.service_reload + - ensure_mariadb.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_mariadb is defined - ensure_mariadb.service_list is defined - ensure_mariadb.service_list is iterable ansible.builtin.service: - enabled: "{{ item.enabled }}" - name: "{{ item.name }}" - state: "{{ item.state }}" - loop: "{{ ensure_mariadb.service_list }}" + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_mariadb.service_list }}' loop_control: - label: "{{ item.name }} will be {{ item.state }}" + label: '{{ item.name }} will be {{ item.state }}' notify: - - "ensure_mariadb.package_facts" - - "ensure_mariadb.service_facts" - - "ensure_mariadb.service_reload" - - "ensure_mariadb.service_restart" -- name: "flush handlers" - ansible.builtin.meta: "flush_handlers" -- name: "ensure mariadb databases" - when: - - mariadb_db_list is defined - - mariadb_db_list is iterable + - ensure_mariadb.package_facts + - ensure_mariadb.service_facts + - ensure_mariadb.service_reload + - ensure_mariadb.service_restart +- name: flush handlers + ansible.builtin.meta: flush_handlers +- name: ensure mariadb databases + when: [mariadb_db_list is defined, mariadb_db_list is iterable] ansible.mysql.mysql_db: - ca_cert: "{{ item.ca_cert | default(omit) }}" - chdir: "{{ item.chdir | default(omit) }}" - check_hostname: "{{ item.check_hostname | default(omit) }}" - client_cert: "{{ item.client_cert | default(omit) }}" - client_key: "{{ item.client_key | default(omit) }}" - collation: "{{ item.collation | default(omit) }}" - config_file: "{{ item.config_file | default(omit) }}" - config_overrides_defaults: "{{ item.config_overrides_defaults | default(omit) }}" - connect_timeout: "{{ item.connect_timeout | default(omit) }}" - dump_extra_args: "{{ item.dump_extra_args | default(omit) }}" - encoding: "{{ item.encoding | default(omit) }}" - force: "{{ item.force | default(omit) }}" - hex_blob: "{{ item.hex_blob | default(omit) }}" - ignore_tables: "{{ item.ignore_tables | default(omit) }}" - login_host: "{{ item.login_host | default(omit) }}" - login_password: "{{ item.login_password | default(omit) }}" - login_port: "{{ item.login_port | default(omit) }}" - login_unix_socket: "{{ item.login_unix_socket | default(omit) }}" - login_user: "{{ item.login_user | default(omit) }}" - master_data: "{{ item.master_data | default(omit) }}" - name: "{{ item.name }}" - pipefail: "{{ item.pipefail | default(omit) }}" - quick: "{{ item.quick | default(omit) }}" - restrict_config_file: "{{ item.restrict_config_file | default(omit) }}" - single_transaction: "{{ item.single_transaction | default(omit) }}" - skip_lock_tables: "{{ item.skip_lock_tables | default(omit) }}" - sql_log_bin: "{{ item.sql_log_bin | default(omit) }}" - state: "{{ item.state }}" - target: "{{ item.target | default(omit) }}" - unsafe_login_password: "{{ item.unsafe_login_password | default(omit) }}" - use_shell: "{{ item.use_shell | default(omit) }}" - loop: "{{ mariadb_db_list }}" + ca_cert: '{{ item.ca_cert | default(omit) }}' + chdir: '{{ item.chdir | default(omit) }}' + check_hostname: '{{ item.check_hostname | default(omit) }}' + client_cert: '{{ item.client_cert | default(omit) }}' + client_key: '{{ item.client_key | default(omit) }}' + collation: '{{ item.collation | default(omit) }}' + config_file: '{{ item.config_file | default(omit) }}' + config_overrides_defaults: '{{ item.config_overrides_defaults | default(omit) }}' + connect_timeout: '{{ item.connect_timeout | default(omit) }}' + dump_extra_args: '{{ item.dump_extra_args | default(omit) }}' + encoding: '{{ item.encoding | default(omit) }}' + force: '{{ item.force | default(omit) }}' + hex_blob: '{{ item.hex_blob | default(omit) }}' + ignore_tables: '{{ item.ignore_tables | default(omit) }}' + login_host: '{{ item.login_host | default(omit) }}' + login_password: '{{ item.login_password | default(omit) }}' + login_port: '{{ item.login_port | default(omit) }}' + login_unix_socket: '{{ item.login_unix_socket | default(omit) }}' + login_user: '{{ item.login_user | default(omit) }}' + master_data: '{{ item.master_data | default(omit) }}' + name: '{{ item.name }}' + pipefail: '{{ item.pipefail | default(omit) }}' + quick: '{{ item.quick | default(omit) }}' + restrict_config_file: '{{ item.restrict_config_file | default(omit) }}' + single_transaction: '{{ item.single_transaction | default(omit) }}' + skip_lock_tables: '{{ item.skip_lock_tables | default(omit) }}' + sql_log_bin: '{{ item.sql_log_bin | default(omit) }}' + state: '{{ item.state }}' + target: '{{ item.target | default(omit) }}' + unsafe_login_password: '{{ item.unsafe_login_password | default(omit) }}' + use_shell: '{{ item.use_shell | default(omit) }}' + loop: '{{ mariadb_db_list }}' loop_control: - label: "{{ item.name }} will be {{ item.state }}" -- name: "ensure mariadb users" - when: - - mariadb_user_list is defined - - mariadb_user_list is iterable + label: '{{ item.name }} will be {{ item.state }}' +- name: ensure mariadb users + when: [mariadb_user_list is defined, mariadb_user_list is iterable] ansible.mysql.mysql_user: - append_privs: "{{ item.append_privs | default(omit) }}" - attributes: "{{ item.attributes | default(omit) }}" - ca_cert: "{{ item.ca_cert | default(omit) }}" - check_hostname: "{{ item.check_hostname | default(omit) }}" - client_cert: "{{ item.client_cert | default(omit) }}" - client_key: "{{ item.client_key | default(omit) }}" - column_case_sensitive: "{{ item.column_case_sensitive | default(omit) }}" - config_file: "{{ item.config_file | default(omit) }}" - connect_timeout: "{{ item.connect_timeout | default(omit) }}" - encrypted: "{{ item.encrypted | default(omit) }}" - force_context: "{{ item.force_context | default(omit) }}" - host: "{{ item.host | default(omit) }}" - host_all: "{{ item.host_all | default(omit) }}" - locked: "{{ item.locked | default(omit) }}" - login_host: "{{ item.login_host | default(omit) }}" - login_password: "{{ item.login_password | default(omit) }}" - login_port: "{{ item.login_port | default(omit) }}" - login_unix_socket: "{{ item.login_unix_socket | default(omit) }}" - login_user: "{{ item.login_user | default(omit) }}" - name: "{{ item.name }}" - password: "{{ item.password | default(omit) }}" - password_expire: "{{ item.password_expire | default(omit) }}" - password_expire_interval: "{{ item.password_expire_interval | default(omit) }}" - plugin: "{{ item.plugin | default(omit) }}" - plugin_auth_string: "{{ item.plugin_auth_string | default(omit) }}" - plugin_hash_string: "{{ item.plugin_hash_string | default(omit) }}" - priv: "{{ item.priv | default(omit) }}" - resource_limits: "{{ item.resource_limits | default(omit) }}" - salt: "{{ item.salt | default(omit) }}" - session_vars: "{{ item.session_vars | default(omit) }}" - sql_log_bin: "{{ item.sql_log_bin | default(omit) }}" - state: "{{ item.state }}" - subtract_privs: "{{ item.subtract_privs | default(omit) }}" - tls_requires: "{{ item.tls_requires | default(omit) }}" - update_password: "{{ item.update_password | default(omit) }}" - loop: "{{ mariadb_user_list }}" + append_privs: '{{ item.append_privs | default(omit) }}' + attributes: '{{ item.attributes | default(omit) }}' + ca_cert: '{{ item.ca_cert | default(omit) }}' + check_hostname: '{{ item.check_hostname | default(omit) }}' + client_cert: '{{ item.client_cert | default(omit) }}' + client_key: '{{ item.client_key | default(omit) }}' + column_case_sensitive: '{{ item.column_case_sensitive | default(omit) }}' + config_file: '{{ item.config_file | default(omit) }}' + connect_timeout: '{{ item.connect_timeout | default(omit) }}' + encrypted: '{{ item.encrypted | default(omit) }}' + force_context: '{{ item.force_context | default(omit) }}' + host: '{{ item.host | default(omit) }}' + host_all: '{{ item.host_all | default(omit) }}' + locked: '{{ item.locked | default(omit) }}' + login_host: '{{ item.login_host | default(omit) }}' + login_password: '{{ item.login_password | default(omit) }}' + login_port: '{{ item.login_port | default(omit) }}' + login_unix_socket: '{{ item.login_unix_socket | default(omit) }}' + login_user: '{{ item.login_user | default(omit) }}' + name: '{{ item.name }}' + password: '{{ item.password | default(omit) }}' + password_expire: '{{ item.password_expire | default(omit) }}' + password_expire_interval: '{{ item.password_expire_interval | default(omit) }}' + plugin: '{{ item.plugin | default(omit) }}' + plugin_auth_string: '{{ item.plugin_auth_string | default(omit) }}' + plugin_hash_string: '{{ item.plugin_hash_string | default(omit) }}' + priv: '{{ item.priv | default(omit) }}' + resource_limits: '{{ item.resource_limits | default(omit) }}' + salt: '{{ item.salt | default(omit) }}' + session_vars: '{{ item.session_vars | default(omit) }}' + sql_log_bin: '{{ item.sql_log_bin | default(omit) }}' + state: '{{ item.state }}' + subtract_privs: '{{ item.subtract_privs | default(omit) }}' + tls_requires: '{{ item.tls_requires | default(omit) }}' + update_password: '{{ item.update_password | default(omit) }}' + loop: '{{ mariadb_user_list }}' loop_control: - label: "{{ item.name }} will be {{ item.state }}" -... + label: '{{ item.name }} will be {{ item.state }}' diff --git a/roles/ensure_mariadb/tests/test.yml b/roles/ensure_mariadb/tests/test.yml index 1fd2cc0..8fe02d7 100644 --- a/roles/ensure_mariadb/tests/test.yml +++ b/roles/ensure_mariadb/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_mariadb \ No newline at end of file + roles: [ensure_mariadb] diff --git a/roles/ensure_mariadb/vars/Fedora-42-default.yml b/roles/ensure_mariadb/vars/Fedora-42-default.yml index fa4bcd4..22a9de3 100644 --- a/roles/ensure_mariadb/vars/Fedora-42-default.yml +++ b/roles/ensure_mariadb/vars/Fedora-42-default.yml @@ -1,134 +1,152 @@ --- # vars file for ensure_mariadb package_list: - - name: 'mariadb' - state: 'present' - - name: 'mariadb-server' - state: 'present' - - name: 'phpMyAdmin' - state: 'present' - - name: 'python3-PyMySQL' - state: 'present' + - name: mariadb + state: present + - name: mariadb-server + state: present + - name: phpMyAdmin + state: present + - name: python3-PyMySQL + state: present firewall_list: - permanent: 'yes' - service: 'mysql' - state: 'enabled' + service: mysql + state: enabled service_list: - - name: 'httpd.service' - state: 'started' + - name: httpd.service + state: started enabled: 'yes' - - name: 'httpd-reload.timer' - state: 'started' + - name: httpd-reload.timer + state: started enabled: 'yes' - - name: 'php-fpm.service' - state: 'started' + - name: php-fpm.service + state: started enabled: 'yes' - - name: 'mariadb-copytls.service' - state: 'started' + - name: mariadb-copytls.service + state: started enabled: 'yes' - - name: 'mariadb.service' - state: 'started' + - name: mariadb.service + state: started enabled: 'yes' template_list: - - dest: '/etc/my.cnf.d/client.cnf' - group: 'root' + - dest: /etc/my.cnf.d/client.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/client.cnf' - - dest: '/etc/my.cnf.d/mariadb-server.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/client.cnf' + - dest: /etc/my.cnf.d/mariadb-server.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/mariadb-server.cnf' - - dest: '/etc/my.cnf.d/mysql-clients.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/mariadb-server.cnf' + - dest: /etc/my.cnf.d/mysql-clients.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/mysql-clients.cnf' - - dest: '/etc/my.cnf.d/spider.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/mysql-clients.cnf' + - dest: /etc/my.cnf.d/spider.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/spider.cnf' - - dest: '/etc/my.cnf.d/enable_encryption.preset' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/spider.cnf' + - dest: /etc/my.cnf.d/enable_encryption.preset + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/enable_encryption.preset' - - dest: '/etc/my.cnf.d/cracklib_password_check.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/enable_encryption.preset' + - dest: /etc/my.cnf.d/cracklib_password_check.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/cracklib_password_check.cnf' - - dest: '/etc/my.cnf.d/auth_gssapi.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/cracklib_password_check.cnf' + - dest: /etc/my.cnf.d/auth_gssapi.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/auth_gssapi.cnf' - - dest: '/etc/my.cnf.d/hashicorp_key_management.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/auth_gssapi.cnf' + - dest: /etc/my.cnf.d/hashicorp_key_management.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/hashicorp_key_management.cnf' - - dest: '/etc/my.cnf.d/provider_bzip2.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/hashicorp_key_management.cnf' + - dest: /etc/my.cnf.d/provider_bzip2.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_bzip2.cnf' - - dest: '/etc/my.cnf.d/provider_lz4.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_bzip2.cnf' + - dest: /etc/my.cnf.d/provider_lz4.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lz4.cnf' - - dest: '/etc/my.cnf.d/provider_lzma.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lz4.cnf' + - dest: /etc/my.cnf.d/provider_lzma.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lzma.cnf' - - dest: '/etc/my.cnf.d/provider_lzo.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lzma.cnf' + - dest: /etc/my.cnf.d/provider_lzo.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lzo.cnf' - - dest: '/etc/my.cnf.d/provider_snappy.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lzo.cnf' + - dest: /etc/my.cnf.d/provider_snappy.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_snappy.cnf' - - dest: '/etc/phpMyAdmin/config.inc.php' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_snappy.cnf' + - dest: /etc/phpMyAdmin/config.inc.php + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/phpMyAdmin/config.inc.php' - - dest: '/etc/my.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/phpMyAdmin/config.inc.php' + - dest: /etc/my.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf' - - dest: '/etc/httpd/conf.d/phpMyAdmin.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf' + - dest: /etc/httpd/conf.d/phpMyAdmin.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/phpMyAdmin.conf' - - dest: '/usr/lib/systemd/system/mariadb.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/phpMyAdmin.conf' + - dest: /usr/lib/systemd/system/mariadb.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb.service' - - dest: '/usr/lib/systemd/system/mariadb@.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb.service' + - dest: /usr/lib/systemd/system/mariadb@.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb@.service' - - dest: '/usr/lib/systemd/system/mariadb-copytls.timer' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb@.service' + - dest: /usr/lib/systemd/system/mariadb-copytls.timer + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb-copytls.timer' - - dest: '/usr/lib/systemd/system/mariadb-copytls.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb-copytls.timer' + - dest: /usr/lib/systemd/system/mariadb-copytls.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb-copytls.service' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb-copytls.service' diff --git a/roles/ensure_mariadb/vars/Fedora-43-default.yml b/roles/ensure_mariadb/vars/Fedora-43-default.yml index fa4bcd4..22a9de3 100644 --- a/roles/ensure_mariadb/vars/Fedora-43-default.yml +++ b/roles/ensure_mariadb/vars/Fedora-43-default.yml @@ -1,134 +1,152 @@ --- # vars file for ensure_mariadb package_list: - - name: 'mariadb' - state: 'present' - - name: 'mariadb-server' - state: 'present' - - name: 'phpMyAdmin' - state: 'present' - - name: 'python3-PyMySQL' - state: 'present' + - name: mariadb + state: present + - name: mariadb-server + state: present + - name: phpMyAdmin + state: present + - name: python3-PyMySQL + state: present firewall_list: - permanent: 'yes' - service: 'mysql' - state: 'enabled' + service: mysql + state: enabled service_list: - - name: 'httpd.service' - state: 'started' + - name: httpd.service + state: started enabled: 'yes' - - name: 'httpd-reload.timer' - state: 'started' + - name: httpd-reload.timer + state: started enabled: 'yes' - - name: 'php-fpm.service' - state: 'started' + - name: php-fpm.service + state: started enabled: 'yes' - - name: 'mariadb-copytls.service' - state: 'started' + - name: mariadb-copytls.service + state: started enabled: 'yes' - - name: 'mariadb.service' - state: 'started' + - name: mariadb.service + state: started enabled: 'yes' template_list: - - dest: '/etc/my.cnf.d/client.cnf' - group: 'root' + - dest: /etc/my.cnf.d/client.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/client.cnf' - - dest: '/etc/my.cnf.d/mariadb-server.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/client.cnf' + - dest: /etc/my.cnf.d/mariadb-server.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/mariadb-server.cnf' - - dest: '/etc/my.cnf.d/mysql-clients.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/mariadb-server.cnf' + - dest: /etc/my.cnf.d/mysql-clients.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/mysql-clients.cnf' - - dest: '/etc/my.cnf.d/spider.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/mysql-clients.cnf' + - dest: /etc/my.cnf.d/spider.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/spider.cnf' - - dest: '/etc/my.cnf.d/enable_encryption.preset' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/spider.cnf' + - dest: /etc/my.cnf.d/enable_encryption.preset + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/enable_encryption.preset' - - dest: '/etc/my.cnf.d/cracklib_password_check.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/enable_encryption.preset' + - dest: /etc/my.cnf.d/cracklib_password_check.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/cracklib_password_check.cnf' - - dest: '/etc/my.cnf.d/auth_gssapi.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/cracklib_password_check.cnf' + - dest: /etc/my.cnf.d/auth_gssapi.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/auth_gssapi.cnf' - - dest: '/etc/my.cnf.d/hashicorp_key_management.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/auth_gssapi.cnf' + - dest: /etc/my.cnf.d/hashicorp_key_management.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/hashicorp_key_management.cnf' - - dest: '/etc/my.cnf.d/provider_bzip2.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/hashicorp_key_management.cnf' + - dest: /etc/my.cnf.d/provider_bzip2.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_bzip2.cnf' - - dest: '/etc/my.cnf.d/provider_lz4.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_bzip2.cnf' + - dest: /etc/my.cnf.d/provider_lz4.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lz4.cnf' - - dest: '/etc/my.cnf.d/provider_lzma.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lz4.cnf' + - dest: /etc/my.cnf.d/provider_lzma.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lzma.cnf' - - dest: '/etc/my.cnf.d/provider_lzo.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lzma.cnf' + - dest: /etc/my.cnf.d/provider_lzo.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lzo.cnf' - - dest: '/etc/my.cnf.d/provider_snappy.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lzo.cnf' + - dest: /etc/my.cnf.d/provider_snappy.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_snappy.cnf' - - dest: '/etc/phpMyAdmin/config.inc.php' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_snappy.cnf' + - dest: /etc/phpMyAdmin/config.inc.php + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/phpMyAdmin/config.inc.php' - - dest: '/etc/my.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/phpMyAdmin/config.inc.php' + - dest: /etc/my.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf' - - dest: '/etc/httpd/conf.d/phpMyAdmin.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf' + - dest: /etc/httpd/conf.d/phpMyAdmin.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/phpMyAdmin.conf' - - dest: '/usr/lib/systemd/system/mariadb.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/phpMyAdmin.conf' + - dest: /usr/lib/systemd/system/mariadb.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb.service' - - dest: '/usr/lib/systemd/system/mariadb@.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb.service' + - dest: /usr/lib/systemd/system/mariadb@.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb@.service' - - dest: '/usr/lib/systemd/system/mariadb-copytls.timer' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb@.service' + - dest: /usr/lib/systemd/system/mariadb-copytls.timer + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb-copytls.timer' - - dest: '/usr/lib/systemd/system/mariadb-copytls.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb-copytls.timer' + - dest: /usr/lib/systemd/system/mariadb-copytls.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb-copytls.service' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb-copytls.service' diff --git a/roles/ensure_mariadb/vars/Fedora-44-default.yml b/roles/ensure_mariadb/vars/Fedora-44-default.yml index fa4bcd4..22a9de3 100644 --- a/roles/ensure_mariadb/vars/Fedora-44-default.yml +++ b/roles/ensure_mariadb/vars/Fedora-44-default.yml @@ -1,134 +1,152 @@ --- # vars file for ensure_mariadb package_list: - - name: 'mariadb' - state: 'present' - - name: 'mariadb-server' - state: 'present' - - name: 'phpMyAdmin' - state: 'present' - - name: 'python3-PyMySQL' - state: 'present' + - name: mariadb + state: present + - name: mariadb-server + state: present + - name: phpMyAdmin + state: present + - name: python3-PyMySQL + state: present firewall_list: - permanent: 'yes' - service: 'mysql' - state: 'enabled' + service: mysql + state: enabled service_list: - - name: 'httpd.service' - state: 'started' + - name: httpd.service + state: started enabled: 'yes' - - name: 'httpd-reload.timer' - state: 'started' + - name: httpd-reload.timer + state: started enabled: 'yes' - - name: 'php-fpm.service' - state: 'started' + - name: php-fpm.service + state: started enabled: 'yes' - - name: 'mariadb-copytls.service' - state: 'started' + - name: mariadb-copytls.service + state: started enabled: 'yes' - - name: 'mariadb.service' - state: 'started' + - name: mariadb.service + state: started enabled: 'yes' template_list: - - dest: '/etc/my.cnf.d/client.cnf' - group: 'root' + - dest: /etc/my.cnf.d/client.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/client.cnf' - - dest: '/etc/my.cnf.d/mariadb-server.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/client.cnf' + - dest: /etc/my.cnf.d/mariadb-server.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/mariadb-server.cnf' - - dest: '/etc/my.cnf.d/mysql-clients.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/mariadb-server.cnf' + - dest: /etc/my.cnf.d/mysql-clients.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/mysql-clients.cnf' - - dest: '/etc/my.cnf.d/spider.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/mysql-clients.cnf' + - dest: /etc/my.cnf.d/spider.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/spider.cnf' - - dest: '/etc/my.cnf.d/enable_encryption.preset' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/spider.cnf' + - dest: /etc/my.cnf.d/enable_encryption.preset + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/enable_encryption.preset' - - dest: '/etc/my.cnf.d/cracklib_password_check.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/enable_encryption.preset' + - dest: /etc/my.cnf.d/cracklib_password_check.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/cracklib_password_check.cnf' - - dest: '/etc/my.cnf.d/auth_gssapi.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/cracklib_password_check.cnf' + - dest: /etc/my.cnf.d/auth_gssapi.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/auth_gssapi.cnf' - - dest: '/etc/my.cnf.d/hashicorp_key_management.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/auth_gssapi.cnf' + - dest: /etc/my.cnf.d/hashicorp_key_management.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/hashicorp_key_management.cnf' - - dest: '/etc/my.cnf.d/provider_bzip2.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/hashicorp_key_management.cnf' + - dest: /etc/my.cnf.d/provider_bzip2.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_bzip2.cnf' - - dest: '/etc/my.cnf.d/provider_lz4.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_bzip2.cnf' + - dest: /etc/my.cnf.d/provider_lz4.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lz4.cnf' - - dest: '/etc/my.cnf.d/provider_lzma.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lz4.cnf' + - dest: /etc/my.cnf.d/provider_lzma.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lzma.cnf' - - dest: '/etc/my.cnf.d/provider_lzo.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lzma.cnf' + - dest: /etc/my.cnf.d/provider_lzo.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_lzo.cnf' - - dest: '/etc/my.cnf.d/provider_snappy.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_lzo.cnf' + - dest: /etc/my.cnf.d/provider_snappy.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf.d/provider_snappy.cnf' - - dest: '/etc/phpMyAdmin/config.inc.php' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf.d/provider_snappy.cnf' + - dest: /etc/phpMyAdmin/config.inc.php + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/phpMyAdmin/config.inc.php' - - dest: '/etc/my.cnf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/phpMyAdmin/config.inc.php' + - dest: /etc/my.cnf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/my.cnf' - - dest: '/etc/httpd/conf.d/phpMyAdmin.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/my.cnf' + - dest: /etc/httpd/conf.d/phpMyAdmin.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/httpd/conf.d/phpMyAdmin.conf' - - dest: '/usr/lib/systemd/system/mariadb.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/httpd/conf.d/phpMyAdmin.conf' + - dest: /usr/lib/systemd/system/mariadb.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb.service' - - dest: '/usr/lib/systemd/system/mariadb@.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb.service' + - dest: /usr/lib/systemd/system/mariadb@.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb@.service' - - dest: '/usr/lib/systemd/system/mariadb-copytls.timer' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb@.service' + - dest: /usr/lib/systemd/system/mariadb-copytls.timer + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb-copytls.timer' - - dest: '/usr/lib/systemd/system/mariadb-copytls.service' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb-copytls.timer' + - dest: /usr/lib/systemd/system/mariadb-copytls.service + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/mariadb-copytls.service' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/mariadb-copytls.service' diff --git a/roles/ensure_mariadb/vars/default.yml b/roles/ensure_mariadb/vars/default.yml index db004be..91da2a7 100644 --- a/roles/ensure_mariadb/vars/default.yml +++ b/roles/ensure_mariadb/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_mariadb \ No newline at end of file +... diff --git a/roles/ensure_mariadb/vars/main.yml b/roles/ensure_mariadb/vars/main.yml index db004be..91da2a7 100644 --- a/roles/ensure_mariadb/vars/main.yml +++ b/roles/ensure_mariadb/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_mariadb \ No newline at end of file +... diff --git a/roles/ensure_os_patch/.travis.yml b/roles/ensure_os_patch/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_os_patch/.travis.yml +++ b/roles/ensure_os_patch/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_os_patch/defaults/main.yml b/roles/ensure_os_patch/defaults/main.yml index 41bd0d1..91da2a7 100644 --- a/roles/ensure_os_patch/defaults/main.yml +++ b/roles/ensure_os_patch/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_os_patch \ No newline at end of file +... diff --git a/roles/ensure_os_patch/handlers/main.yml b/roles/ensure_os_patch/handlers/main.yml index 797fda6..38fb24b 100644 --- a/roles/ensure_os_patch/handlers/main.yml +++ b/roles/ensure_os_patch/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_os_patch -- name: 'ensure_os_patch.package_facts' +- name: ensure_os_patch.package_facts ansible.builtin.package_facts: -- name: 'ensure_os_patch.service_facts' +- name: ensure_os_patch.service_facts ansible.builtin.service_facts: -- name: 'ensure_os_patch.service_reload' +- name: ensure_os_patch.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_os_patch is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_os_patch.service_restart' +- name: ensure_os_patch.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_os_patch is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_os_patch.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_os_patch/meta/main.yml b/roles/ensure_os_patch/meta/main.yml index 42b4504..8777568 100644 --- a/roles/ensure_os_patch/meta/main.yml +++ b/roles/ensure_os_patch/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensure OS patches are applied @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_os_patch/tasks/main.yml b/roles/ensure_os_patch/tasks/main.yml index 26673c5..0def067 100644 --- a/roles/ensure_os_patch/tasks/main.yml +++ b/roles/ensure_os_patch/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_os_patch -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_os_patch' + name: ensure_os_patch vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_os_patch is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_os_patch.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_os_patch.package_facts' - - 'ensure_os_patch.service_facts' -- name: 'ensure apt patch' + notify: [ensure_os_patch.package_facts, ensure_os_patch.service_facts] +- name: ensure apt patch when: - ansible_facts["system"] == 'Linux' - ansible_facts["pkg_mgr"] == 'apt' @@ -52,33 +52,27 @@ autoclean: 'yes' autoremove: 'yes' update_cache: 'yes' - upgrade: 'dist' - notify: - - 'ensure_os_patch.package_facts' - - 'ensure_os_patch.service_facts' -- name: 'ensure dnf' + upgrade: dist + notify: [ensure_os_patch.package_facts, ensure_os_patch.service_facts] +- name: ensure dnf when: - ansible_facts["system"] == 'Linux' - ansible_facts["pkg_mgr"] == 'dnf' ansible.builtin.dnf: name: '*' - state: 'latest' + state: latest update_cache: 'yes' - notify: - - 'ensure_os_patch.package_facts' - - 'ensure_os_patch.service_facts' -- name: 'ensure dnf5' + notify: [ensure_os_patch.package_facts, ensure_os_patch.service_facts] +- name: ensure dnf5 when: - ansible_facts["system"] == 'Linux' - ansible_facts["pkg_mgr"] == 'dnf5' ansible.builtin.dnf5: name: '*' - state: 'latest' + state: latest update_cache: 'yes' - notify: - - 'ensure_os_patch.package_facts' - - 'ensure_os_patch.service_facts' -- name: 'ensure services' + notify: [ensure_os_patch.package_facts, ensure_os_patch.service_facts] +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_os_patch is defined @@ -91,10 +85,6 @@ loop: '{{ ensure_os_patch.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_os_patch.package_facts' - - 'ensure_os_patch.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + notify: [ensure_os_patch.package_facts, ensure_os_patch.service_facts] +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_os_patch/tests/test.yml b/roles/ensure_os_patch/tests/test.yml index 024e967..59eb0ec 100644 --- a/roles/ensure_os_patch/tests/test.yml +++ b/roles/ensure_os_patch/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_os_patch \ No newline at end of file + roles: [ensure_os_patch] diff --git a/roles/ensure_os_patch/vars/AlmaLinux-10-default.yml b/roles/ensure_os_patch/vars/AlmaLinux-10-default.yml index a85d5d6..ae82350 100644 --- a/roles/ensure_os_patch/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_os_patch/vars/AlmaLinux-10-default.yml @@ -1,14 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... - diff --git a/roles/ensure_os_patch/vars/AlmaLinux-9-default.yml b/roles/ensure_os_patch/vars/AlmaLinux-9-default.yml index a85d5d6..ae82350 100644 --- a/roles/ensure_os_patch/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_os_patch/vars/AlmaLinux-9-default.yml @@ -1,14 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... - diff --git a/roles/ensure_os_patch/vars/CentOS-10-default.yml b/roles/ensure_os_patch/vars/CentOS-10-default.yml index a85d5d6..ae82350 100644 --- a/roles/ensure_os_patch/vars/CentOS-10-default.yml +++ b/roles/ensure_os_patch/vars/CentOS-10-default.yml @@ -1,14 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... - diff --git a/roles/ensure_os_patch/vars/CentOS-9-default.yml b/roles/ensure_os_patch/vars/CentOS-9-default.yml index a85d5d6..ae82350 100644 --- a/roles/ensure_os_patch/vars/CentOS-9-default.yml +++ b/roles/ensure_os_patch/vars/CentOS-9-default.yml @@ -1,14 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... - diff --git a/roles/ensure_os_patch/vars/Fedora-42-default.yml b/roles/ensure_os_patch/vars/Fedora-42-default.yml index ddda6ef..1698692 100644 --- a/roles/ensure_os_patch/vars/Fedora-42-default.yml +++ b/roles/ensure_os_patch/vars/Fedora-42-default.yml @@ -1,10 +1,9 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf5-plugin-automatic' - state: 'present' + - name: dnf5-plugin-automatic + state: present service_list: - - name: 'dnf5-automatic.timer' - state: 'started' + - name: dnf5-automatic.timer + state: started enabled: 'yes' -... diff --git a/roles/ensure_os_patch/vars/Fedora-43-default.yml b/roles/ensure_os_patch/vars/Fedora-43-default.yml index ddda6ef..1698692 100644 --- a/roles/ensure_os_patch/vars/Fedora-43-default.yml +++ b/roles/ensure_os_patch/vars/Fedora-43-default.yml @@ -1,10 +1,9 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf5-plugin-automatic' - state: 'present' + - name: dnf5-plugin-automatic + state: present service_list: - - name: 'dnf5-automatic.timer' - state: 'started' + - name: dnf5-automatic.timer + state: started enabled: 'yes' -... diff --git a/roles/ensure_os_patch/vars/Fedora-44-default.yml b/roles/ensure_os_patch/vars/Fedora-44-default.yml index ddda6ef..1698692 100644 --- a/roles/ensure_os_patch/vars/Fedora-44-default.yml +++ b/roles/ensure_os_patch/vars/Fedora-44-default.yml @@ -1,10 +1,9 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf5-plugin-automatic' - state: 'present' + - name: dnf5-plugin-automatic + state: present service_list: - - name: 'dnf5-automatic.timer' - state: 'started' + - name: dnf5-automatic.timer + state: started enabled: 'yes' -... diff --git a/roles/ensure_os_patch/vars/OracleLinux-10-default.yml b/roles/ensure_os_patch/vars/OracleLinux-10-default.yml index 9c4bbbd..ae82350 100644 --- a/roles/ensure_os_patch/vars/OracleLinux-10-default.yml +++ b/roles/ensure_os_patch/vars/OracleLinux-10-default.yml @@ -1,13 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... diff --git a/roles/ensure_os_patch/vars/OracleLinux-9-default.yml b/roles/ensure_os_patch/vars/OracleLinux-9-default.yml index 9c4bbbd..ae82350 100644 --- a/roles/ensure_os_patch/vars/OracleLinux-9-default.yml +++ b/roles/ensure_os_patch/vars/OracleLinux-9-default.yml @@ -1,13 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... diff --git a/roles/ensure_os_patch/vars/Rocky-10-default.yml b/roles/ensure_os_patch/vars/Rocky-10-default.yml index 9c4bbbd..ae82350 100644 --- a/roles/ensure_os_patch/vars/Rocky-10-default.yml +++ b/roles/ensure_os_patch/vars/Rocky-10-default.yml @@ -1,13 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... diff --git a/roles/ensure_os_patch/vars/Rocky-9-default.yml b/roles/ensure_os_patch/vars/Rocky-9-default.yml index 9c4bbbd..ae82350 100644 --- a/roles/ensure_os_patch/vars/Rocky-9-default.yml +++ b/roles/ensure_os_patch/vars/Rocky-9-default.yml @@ -1,13 +1,12 @@ --- # vars file for ensure_os_patch package_list: - - name: 'dnf-automatic' - state: 'present' + - name: dnf-automatic + state: present service_list: - - name: 'dnf-automatic.timer' - state: 'started' + - name: dnf-automatic.timer + state: started enabled: 'yes' - - name: 'dnf-automatic-install.timer' - state: 'started' + - name: dnf-automatic-install.timer + state: started enabled: 'yes' -... diff --git a/roles/ensure_os_patch/vars/default.yml b/roles/ensure_os_patch/vars/default.yml index fcb2238..91da2a7 100644 --- a/roles/ensure_os_patch/vars/default.yml +++ b/roles/ensure_os_patch/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_os_patch \ No newline at end of file +... diff --git a/roles/ensure_os_patch/vars/main.yml b/roles/ensure_os_patch/vars/main.yml index fcb2238..91da2a7 100644 --- a/roles/ensure_os_patch/vars/main.yml +++ b/roles/ensure_os_patch/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_os_patch \ No newline at end of file +... diff --git a/roles/ensure_os_upgrade/.travis.yml b/roles/ensure_os_upgrade/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_os_upgrade/.travis.yml +++ b/roles/ensure_os_upgrade/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_os_upgrade/defaults/main.yml b/roles/ensure_os_upgrade/defaults/main.yml index 44a0374..91da2a7 100644 --- a/roles/ensure_os_upgrade/defaults/main.yml +++ b/roles/ensure_os_upgrade/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_os_upgrade \ No newline at end of file +... diff --git a/roles/ensure_os_upgrade/handlers/main.yml b/roles/ensure_os_upgrade/handlers/main.yml index b00406b..fb78098 100644 --- a/roles/ensure_os_upgrade/handlers/main.yml +++ b/roles/ensure_os_upgrade/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_os_upgrade -- name: 'ensure_os_upgrade.package_facts' +- name: ensure_os_upgrade.package_facts ansible.builtin.package_facts: -- name: 'ensure_os_upgrade.service_facts' +- name: ensure_os_upgrade.service_facts ansible.builtin.service_facts: -- name: 'ensure_os_upgrade.service_reload' +- name: ensure_os_upgrade.service_reload when: - ansible_system == 'Linux' - ansible_service_mgr == 'systemd' - ensure_os_upgrade is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_os_upgrade.service_restart' +- name: ensure_os_upgrade.service_restart when: - ansible_system == 'Linux' - ensure_os_upgrade is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_os_upgrade.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_os_upgrade/meta/main.yml b/roles/ensure_os_upgrade/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_os_upgrade/meta/main.yml +++ b/roles/ensure_os_upgrade/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_os_upgrade/tasks/main.yml b/roles/ensure_os_upgrade/tasks/main.yml index 7a95602..6602079 100644 --- a/roles/ensure_os_upgrade/tasks/main.yml +++ b/roles/ensure_os_upgrade/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_os_upgrade -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_os_upgrade' + name: ensure_os_upgrade vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_os_upgrade is defined @@ -42,9 +44,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_os_upgrade.package_facts' - - 'ensure_os_upgrade.service_facts' -- name: 'ensure services' + - ensure_os_upgrade.package_facts + - ensure_os_upgrade.service_facts +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_os_upgrade is defined @@ -58,9 +60,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_os_upgrade.package_facts' - - 'ensure_os_upgrade.service_facts' -- name: 'Ensure system-upgrade download' + - ensure_os_upgrade.package_facts + - ensure_os_upgrade.service_facts +- name: Ensure system-upgrade download when: - ansible_facts["system"] == 'Linux' - ansible_facts["distribution"] == 'Fedora' @@ -71,7 +73,7 @@ - ansible_facts["distribution_major_version"]|int < ensure_os_upgrade.target_version|int ansible.builtin.shell: > dnf -y system-upgrade download --refresh --releasever={{ ensure_os_upgrade.target_version|int }} -- name: 'Ensure system-upgrade reboot' +- name: Ensure system-upgrade reboot when: - ansible_facts["system"] == 'Linux' - ansible_facts["distribution"] == 'Fedora' @@ -84,7 +86,7 @@ poll: 0 ansible.builtin.shell: > sleep 5 && dnf -y system-upgrade reboot -- name: 'Wait for the reboot' +- name: Wait for the reboot when: - ansible_facts["system"] == 'Linux' - ansible_facts["distribution"] == 'Fedora' @@ -98,16 +100,15 @@ delay: '300' host: '{{ (ansible_ssh_host|default(ansible_host))|default(inventory_hostname) }}' port: '22' - search_regex: 'OpenSSH' + search_regex: OpenSSH sleep: '15' timeout: '1800' vars: - ansible_connection: 'local' -- name: 'Gather facts' + ansible_connection: local +- name: Gather facts ansible.builtin.setup: notify: - - 'ensure_os_upgrade.package_facts' - - 'ensure_os_upgrade.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... + - ensure_os_upgrade.package_facts + - ensure_os_upgrade.service_facts +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_os_upgrade/tests/test.yml b/roles/ensure_os_upgrade/tests/test.yml index 560d3e0..87cd942 100644 --- a/roles/ensure_os_upgrade/tests/test.yml +++ b/roles/ensure_os_upgrade/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_os_upgrade \ No newline at end of file + roles: [ensure_os_upgrade] diff --git a/roles/ensure_os_upgrade/vars/Fedora-42-default.yml b/roles/ensure_os_upgrade/vars/Fedora-42-default.yml index c901f5a..2d627f3 100644 --- a/roles/ensure_os_upgrade/vars/Fedora-42-default.yml +++ b/roles/ensure_os_upgrade/vars/Fedora-42-default.yml @@ -1,8 +1,6 @@ --- # vars file for ensure_os_upgrade package_list: - - name: 'dnf-plugin-system-upgrade' - state: 'present' + - name: dnf-plugin-system-upgrade + state: present target_version: '43' -... - diff --git a/roles/ensure_os_upgrade/vars/default.yml b/roles/ensure_os_upgrade/vars/default.yml index d632f23..91da2a7 100644 --- a/roles/ensure_os_upgrade/vars/default.yml +++ b/roles/ensure_os_upgrade/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_os_upgrade \ No newline at end of file +... diff --git a/roles/ensure_os_upgrade/vars/main.yml b/roles/ensure_os_upgrade/vars/main.yml index d632f23..91da2a7 100644 --- a/roles/ensure_os_upgrade/vars/main.yml +++ b/roles/ensure_os_upgrade/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_os_upgrade \ No newline at end of file +... diff --git a/roles/ensure_podman/.travis.yml b/roles/ensure_podman/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_podman/.travis.yml +++ b/roles/ensure_podman/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_podman/defaults/main.yml b/roles/ensure_podman/defaults/main.yml index e0e131e..91da2a7 100644 --- a/roles/ensure_podman/defaults/main.yml +++ b/roles/ensure_podman/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_podman \ No newline at end of file +... diff --git a/roles/ensure_podman/handlers/main.yml b/roles/ensure_podman/handlers/main.yml index 3336b42..763c270 100644 --- a/roles/ensure_podman/handlers/main.yml +++ b/roles/ensure_podman/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_podman -- name: 'ensure_podman.package_facts' +- name: ensure_podman.package_facts ansible.builtin.package_facts: -- name: 'ensure_podman.service_facts' +- name: ensure_podman.service_facts ansible.builtin.service_facts: -- name: 'ensure_podman.service_reload' +- name: ensure_podman.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_podman is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_podman.service_restart' +- name: ensure_podman.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_podman is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_podman.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_podman/meta/main.yml b/roles/ensure_podman/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_podman/meta/main.yml +++ b/roles/ensure_podman/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_podman/tasks/main.yml b/roles/ensure_podman/tasks/main.yml index a779d9f..932106c 100644 --- a/roles/ensure_podman/tasks/main.yml +++ b/roles/ensure_podman/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_podman -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_podman' + name: ensure_podman vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_podman is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_podman.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_podman.package_facts' - - 'ensure_podman.service_facts' -- name: 'ensure services' + notify: [ensure_podman.package_facts, ensure_podman.service_facts] +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_podman is defined @@ -57,10 +57,8 @@ loop: '{{ ensure_podman.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_podman.package_facts' - - 'ensure_podman.service_facts' -- name: 'Ensure cgroup v2 have not been disabled' + notify: [ensure_podman.package_facts, ensure_podman.service_facts] +- name: Ensure cgroup v2 have not been disabled when: - ansible_facts["system"] == 'Linux' - ensure_podman is defined @@ -71,7 +69,7 @@ ansible.builtin.shell: cmd: | grubby --update-kernel=ALL --remove-args=systemd.unified_cgroup_hierarchy=0 -- name: 'Reboot to disable cgroups v1' +- name: Reboot to disable cgroups v1 when: - ansible_facts["system"] == 'Linux' - ensure_podman is defined @@ -80,6 +78,5 @@ - ansible_cmdline is defined - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined ansible.builtin.reboot: -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_podman/tests/test.yml b/roles/ensure_podman/tests/test.yml index 0f07de7..6bcb120 100644 --- a/roles/ensure_podman/tests/test.yml +++ b/roles/ensure_podman/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_podman \ No newline at end of file + roles: [ensure_podman] diff --git a/roles/ensure_podman/vars/AlmaLinux-10-default.yml b/roles/ensure_podman/vars/AlmaLinux-10-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_podman/vars/AlmaLinux-10-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/AlmaLinux-9-default.yml b/roles/ensure_podman/vars/AlmaLinux-9-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_podman/vars/AlmaLinux-9-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/CentOS-10-default.yml b/roles/ensure_podman/vars/CentOS-10-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/CentOS-10-default.yml +++ b/roles/ensure_podman/vars/CentOS-10-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/CentOS-9-default.yml b/roles/ensure_podman/vars/CentOS-9-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/CentOS-9-default.yml +++ b/roles/ensure_podman/vars/CentOS-9-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/Fedora-42-default.yml b/roles/ensure_podman/vars/Fedora-42-default.yml index e5f0112..72d94df 100644 --- a/roles/ensure_podman/vars/Fedora-42-default.yml +++ b/roles/ensure_podman/vars/Fedora-42-default.yml @@ -1,13 +1,13 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' - - name: 'podman-compose' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present + - name: podman-compose + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/Fedora-43-default.yml b/roles/ensure_podman/vars/Fedora-43-default.yml index e5f0112..72d94df 100644 --- a/roles/ensure_podman/vars/Fedora-43-default.yml +++ b/roles/ensure_podman/vars/Fedora-43-default.yml @@ -1,13 +1,13 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' - - name: 'podman-compose' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present + - name: podman-compose + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/Fedora-44-default.yml b/roles/ensure_podman/vars/Fedora-44-default.yml index e5f0112..72d94df 100644 --- a/roles/ensure_podman/vars/Fedora-44-default.yml +++ b/roles/ensure_podman/vars/Fedora-44-default.yml @@ -1,13 +1,13 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' - - name: 'podman-compose' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present + - name: podman-compose + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/OracleLinux-10-default.yml b/roles/ensure_podman/vars/OracleLinux-10-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/OracleLinux-10-default.yml +++ b/roles/ensure_podman/vars/OracleLinux-10-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/OracleLinux-9-default.yml b/roles/ensure_podman/vars/OracleLinux-9-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/OracleLinux-9-default.yml +++ b/roles/ensure_podman/vars/OracleLinux-9-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/Rocky-10-default.yml b/roles/ensure_podman/vars/Rocky-10-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/Rocky-10-default.yml +++ b/roles/ensure_podman/vars/Rocky-10-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/Rocky-9-default.yml b/roles/ensure_podman/vars/Rocky-9-default.yml index e911115..bbde49b 100644 --- a/roles/ensure_podman/vars/Rocky-9-default.yml +++ b/roles/ensure_podman/vars/Rocky-9-default.yml @@ -1,11 +1,11 @@ --- # vars file for ensure_podman package_list: - - name: 'cockpit-podman' - state: 'present' - - name: 'podman' - state: 'present' + - name: cockpit-podman + state: present + - name: podman + state: present service_list: - - name: 'podman.socket' - state: 'started' + - name: podman.socket + state: started enabled: 'yes' diff --git a/roles/ensure_podman/vars/default.yml b/roles/ensure_podman/vars/default.yml index b70da1a..91da2a7 100644 --- a/roles/ensure_podman/vars/default.yml +++ b/roles/ensure_podman/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_podman \ No newline at end of file +... diff --git a/roles/ensure_podman/vars/main.yml b/roles/ensure_podman/vars/main.yml index b70da1a..91da2a7 100644 --- a/roles/ensure_podman/vars/main.yml +++ b/roles/ensure_podman/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_podman \ No newline at end of file +... diff --git a/roles/ensure_postfix/.travis.yml b/roles/ensure_postfix/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_postfix/.travis.yml +++ b/roles/ensure_postfix/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_postfix/defaults/main.yml b/roles/ensure_postfix/defaults/main.yml index bddcd8d..e35f72e 100644 --- a/roles/ensure_postfix/defaults/main.yml +++ b/roles/ensure_postfix/defaults/main.yml @@ -1,5 +1,5 @@ --- # defaults file for ensure_postfix -postmaster_email: 'postmaster@example.com' +postmaster_email: postmaster@example.com postfix_vhost: '{{ inventory_hostname }}' postfix_message_size_limit: 10240000 diff --git a/roles/ensure_postfix/handlers/main.yml b/roles/ensure_postfix/handlers/main.yml index 24d3b02..70d7d7a 100644 --- a/roles/ensure_postfix/handlers/main.yml +++ b/roles/ensure_postfix/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_postfix -- name: 'ensure_postfix.package_facts' +- name: ensure_postfix.package_facts ansible.builtin.package_facts: -- name: 'ensure_postfix.service_facts' +- name: ensure_postfix.service_facts ansible.builtin.service_facts: -- name: 'ensure_postfix.service_reload' +- name: ensure_postfix.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_postfix is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_postfix.service_restart' +- name: ensure_postfix.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_postfix is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_postfix.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_postfix/meta/main.yml b/roles/ensure_postfix/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_postfix/meta/main.yml +++ b/roles/ensure_postfix/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_postfix/tasks/main.yml b/roles/ensure_postfix/tasks/main.yml index 07ae107..e92368f 100644 --- a/roles/ensure_postfix/tasks/main.yml +++ b/roles/ensure_postfix/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_postfix -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_postfix' + name: ensure_postfix vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure sysctl' +- name: ensure sysctl when: - ansible_facts["system"] == 'Linux' - ensure_postfix is defined @@ -46,11 +48,11 @@ loop_control: label: '{{ item.name }} will be {{ item.value }}' notify: - - 'ensure_postfix.package_facts' - - 'ensure_postfix.service_facts' - - 'ensure_postfix.service_reload' - - 'ensure_postfix.service_restart' -- name: 'ensure packages' + - ensure_postfix.package_facts + - ensure_postfix.service_facts + - ensure_postfix.service_reload + - ensure_postfix.service_restart +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_postfix is defined @@ -63,11 +65,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_postfix.package_facts' - - 'ensure_postfix.service_facts' - - 'ensure_postfix.service_reload' - - 'ensure_postfix.service_restart' -- name: 'ensure seboolean' + - ensure_postfix.package_facts + - ensure_postfix.service_facts + - ensure_postfix.service_reload + - ensure_postfix.service_restart +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_postfix is defined @@ -81,11 +83,11 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_postfix.package_facts' - - 'ensure_postfix.service_facts' - - 'ensure_postfix.service_reload' - - 'ensure_postfix.service_restart' -- name: 'ensure configurations' + - ensure_postfix.package_facts + - ensure_postfix.service_facts + - ensure_postfix.service_reload + - ensure_postfix.service_restart +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_postfix is defined @@ -106,11 +108,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_postfix.package_facts' - - 'ensure_postfix.service_facts' - - 'ensure_postfix.service_reload' - - 'ensure_postfix.service_restart' -- name: 'ensure firewall' + - ensure_postfix.package_facts + - ensure_postfix.service_facts + - ensure_postfix.service_reload + - ensure_postfix.service_restart +- name: ensure firewall when: - ansible_facts["system"] == 'Linux' - ansible_facts.packages["firewalld"] is defined @@ -126,11 +128,11 @@ loop_control: label: '{{ item.service }} will be {{ item.state }}' notify: - - 'ensure_postfix.package_facts' - - 'ensure_postfix.service_facts' - - 'ensure_postfix.service_reload' - - 'ensure_postfix.service_restart' -- name: 'ensure services' + - ensure_postfix.package_facts + - ensure_postfix.service_facts + - ensure_postfix.service_reload + - ensure_postfix.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_postfix is defined @@ -143,10 +145,6 @@ loop: '{{ ensure_postfix.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_postfix.package_facts' - - 'ensure_postfix.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + notify: [ensure_postfix.package_facts, ensure_postfix.service_facts] +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_postfix/tests/test.yml b/roles/ensure_postfix/tests/test.yml index 26c57ca..4c4c438 100644 --- a/roles/ensure_postfix/tests/test.yml +++ b/roles/ensure_postfix/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_postfix \ No newline at end of file + roles: [ensure_postfix] diff --git a/roles/ensure_postfix/vars/Fedora-42-default.yml b/roles/ensure_postfix/vars/Fedora-42-default.yml index fb27efe..a53c17c 100644 --- a/roles/ensure_postfix/vars/Fedora-42-default.yml +++ b/roles/ensure_postfix/vars/Fedora-42-default.yml @@ -1,112 +1,138 @@ --- # vars file for ensure_postfix milter_list: - - description: 'OpenDKIM' - hostname: 'localhost' + - description: OpenDKIM + hostname: localhost port: '8891' - protocol: 'inet' - - description: 'OpenDMARC' - hostname: 'localhost' + protocol: inet + - description: OpenDMARC + hostname: localhost port: '8893' - protocol: 'inet' + protocol: inet package_list: - - name: 'opendkim' - state: 'present' - - name: 'opendkim-tools' - state: 'present' - - name: 'opendmarc' - state: 'present' - - name: 'postfix' - state: 'present' - - name: 'postfix-ldap' - state: 'present' - - name: 'postfix-mysql' - state: 'present' - - name: 'postfix-pcre' - state: 'present' - - name: 'spamass-milter' - state: 'present' - - name: 'spamassassin' - state: 'present' + - name: opendkim + state: present + - name: opendkim-tools + state: present + - name: opendmarc + state: present + - name: postfix + state: present + - name: postfix-ldap + state: present + - name: postfix-mysql + state: present + - name: postfix-pcre + state: present + - name: spamass-milter + state: present + - name: spamassassin + state: present firewall_list: - permanent: 'yes' - service: 'smtp' - state: 'enabled' + service: smtp + state: enabled - permanent: 'yes' - service: 'smtps' - state: 'enabled' + service: smtps + state: enabled - permanent: 'yes' - service: 'smtp-submission' - state: 'enabled' + service: smtp-submission + state: enabled service_list: - enabled: 'yes' - name: 'opendkim.service' - state: 'started' + name: opendkim.service + state: started - enabled: 'yes' - name: 'opendmarc.service' - state: 'started' + name: opendmarc.service + state: started - enabled: 'yes' - name: 'postfix.service' - state: 'started' + name: postfix.service + state: started - enabled: 'yes' - name: 'postfix-copytls.service' - state: 'started' + name: postfix-copytls.service + state: started - enabled: 'yes' - name: 'postfix-copytls.timer' - state: 'started' + name: postfix-copytls.timer + state: started template_list: - - dest: '/etc/postfix/dynamicmaps.cf.d/ldap' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/ldap' - - dest: '/etc/postfix/dynamicmaps.cf.d/mysql' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/mysql' - - dest: '/etc/postfix/dynamicmaps.cf.d/pcre' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/pcre' - - dest: '/etc/postfix/postfix-files.d/ldap' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/ldap' - - dest: '/etc/postfix/postfix-files.d/mysql' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/mysql' - - dest: '/etc/postfix/postfix-files.d/pcre' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/pcre' - - dest: '/etc/postfix/access' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/access' - - dest: '/etc/postfix/canonical' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/canonical' - - dest: '/etc/postfix/dynamicmaps.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf' - - dest: '/etc/postfix/generic' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/generic' - - dest: '/etc/postfix/header_checks' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/header_checks' - - dest: '/etc/postfix/main.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/main.cf' - - dest: '/etc/postfix/main.cf.proto' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/main.cf.proto' - - dest: '/etc/postfix/master.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/master.cf' - - dest: '/etc/postfix/master.cf.proto' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/master.cf.proto' - - dest: '/etc/postfix/postfix-files' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files' - - dest: '/etc/postfix/relocated' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/relocated' - - dest: '/etc/postfix/transport' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/transport' - - dest: '/etc/postfix/virtual' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/virtual' - - dest: '/etc/opendkim/KeyTable' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/KeyTable' - - dest: '/etc/opendkim/SigningTable' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/SigningTable' - - dest: '/etc/opendkim/TrustedHosts' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/TrustedHosts' - - dest: '/etc/opendkim.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim.conf' - - dest: '/etc/opendmarc.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendmarc.conf' - - dest: '/etc/opendmarc/ignore.hosts' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendmarc/ignore.hosts' - - dest: '/usr/lib/systemd/system/postfix-copytls.service' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/postfix-copytls.service' - - dest: '/usr/lib/systemd/system/postfix-copytls.timer' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/postfix-copytls.timer' - + - dest: /etc/postfix/dynamicmaps.cf.d/ldap + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/ldap' + - dest: /etc/postfix/dynamicmaps.cf.d/mysql + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/mysql' + - dest: /etc/postfix/dynamicmaps.cf.d/pcre + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/pcre' + - dest: /etc/postfix/postfix-files.d/ldap + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/ldap' + - dest: /etc/postfix/postfix-files.d/mysql + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/mysql' + - dest: /etc/postfix/postfix-files.d/pcre + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/pcre' + - dest: /etc/postfix/access + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/access' + - dest: /etc/postfix/canonical + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/canonical' + - dest: /etc/postfix/dynamicmaps.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf' + - dest: /etc/postfix/generic + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/generic' + - dest: /etc/postfix/header_checks + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/header_checks' + - dest: /etc/postfix/main.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/main.cf' + - dest: /etc/postfix/main.cf.proto + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/main.cf.proto' + - dest: /etc/postfix/master.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/master.cf' + - dest: /etc/postfix/master.cf.proto + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/master.cf.proto' + - dest: /etc/postfix/postfix-files + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files' + - dest: /etc/postfix/relocated + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/relocated' + - dest: /etc/postfix/transport + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/transport' + - dest: /etc/postfix/virtual + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/virtual' + - dest: /etc/opendkim/KeyTable + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/KeyTable' + - dest: /etc/opendkim/SigningTable + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/SigningTable' + - dest: /etc/opendkim/TrustedHosts + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/TrustedHosts' + - dest: /etc/opendkim.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim.conf' + - dest: /etc/opendmarc.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendmarc.conf' + - dest: /etc/opendmarc/ignore.hosts + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendmarc/ignore.hosts' + - dest: /usr/lib/systemd/system/postfix-copytls.service + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/postfix-copytls.service' + - dest: /usr/lib/systemd/system/postfix-copytls.timer + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/postfix-copytls.timer' diff --git a/roles/ensure_postfix/vars/Fedora-43-default.yml b/roles/ensure_postfix/vars/Fedora-43-default.yml index fb27efe..a53c17c 100644 --- a/roles/ensure_postfix/vars/Fedora-43-default.yml +++ b/roles/ensure_postfix/vars/Fedora-43-default.yml @@ -1,112 +1,138 @@ --- # vars file for ensure_postfix milter_list: - - description: 'OpenDKIM' - hostname: 'localhost' + - description: OpenDKIM + hostname: localhost port: '8891' - protocol: 'inet' - - description: 'OpenDMARC' - hostname: 'localhost' + protocol: inet + - description: OpenDMARC + hostname: localhost port: '8893' - protocol: 'inet' + protocol: inet package_list: - - name: 'opendkim' - state: 'present' - - name: 'opendkim-tools' - state: 'present' - - name: 'opendmarc' - state: 'present' - - name: 'postfix' - state: 'present' - - name: 'postfix-ldap' - state: 'present' - - name: 'postfix-mysql' - state: 'present' - - name: 'postfix-pcre' - state: 'present' - - name: 'spamass-milter' - state: 'present' - - name: 'spamassassin' - state: 'present' + - name: opendkim + state: present + - name: opendkim-tools + state: present + - name: opendmarc + state: present + - name: postfix + state: present + - name: postfix-ldap + state: present + - name: postfix-mysql + state: present + - name: postfix-pcre + state: present + - name: spamass-milter + state: present + - name: spamassassin + state: present firewall_list: - permanent: 'yes' - service: 'smtp' - state: 'enabled' + service: smtp + state: enabled - permanent: 'yes' - service: 'smtps' - state: 'enabled' + service: smtps + state: enabled - permanent: 'yes' - service: 'smtp-submission' - state: 'enabled' + service: smtp-submission + state: enabled service_list: - enabled: 'yes' - name: 'opendkim.service' - state: 'started' + name: opendkim.service + state: started - enabled: 'yes' - name: 'opendmarc.service' - state: 'started' + name: opendmarc.service + state: started - enabled: 'yes' - name: 'postfix.service' - state: 'started' + name: postfix.service + state: started - enabled: 'yes' - name: 'postfix-copytls.service' - state: 'started' + name: postfix-copytls.service + state: started - enabled: 'yes' - name: 'postfix-copytls.timer' - state: 'started' + name: postfix-copytls.timer + state: started template_list: - - dest: '/etc/postfix/dynamicmaps.cf.d/ldap' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/ldap' - - dest: '/etc/postfix/dynamicmaps.cf.d/mysql' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/mysql' - - dest: '/etc/postfix/dynamicmaps.cf.d/pcre' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/pcre' - - dest: '/etc/postfix/postfix-files.d/ldap' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/ldap' - - dest: '/etc/postfix/postfix-files.d/mysql' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/mysql' - - dest: '/etc/postfix/postfix-files.d/pcre' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/pcre' - - dest: '/etc/postfix/access' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/access' - - dest: '/etc/postfix/canonical' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/canonical' - - dest: '/etc/postfix/dynamicmaps.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf' - - dest: '/etc/postfix/generic' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/generic' - - dest: '/etc/postfix/header_checks' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/header_checks' - - dest: '/etc/postfix/main.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/main.cf' - - dest: '/etc/postfix/main.cf.proto' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/main.cf.proto' - - dest: '/etc/postfix/master.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/master.cf' - - dest: '/etc/postfix/master.cf.proto' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/master.cf.proto' - - dest: '/etc/postfix/postfix-files' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files' - - dest: '/etc/postfix/relocated' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/relocated' - - dest: '/etc/postfix/transport' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/transport' - - dest: '/etc/postfix/virtual' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/virtual' - - dest: '/etc/opendkim/KeyTable' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/KeyTable' - - dest: '/etc/opendkim/SigningTable' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/SigningTable' - - dest: '/etc/opendkim/TrustedHosts' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/TrustedHosts' - - dest: '/etc/opendkim.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim.conf' - - dest: '/etc/opendmarc.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendmarc.conf' - - dest: '/etc/opendmarc/ignore.hosts' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendmarc/ignore.hosts' - - dest: '/usr/lib/systemd/system/postfix-copytls.service' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/postfix-copytls.service' - - dest: '/usr/lib/systemd/system/postfix-copytls.timer' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/postfix-copytls.timer' - + - dest: /etc/postfix/dynamicmaps.cf.d/ldap + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/ldap' + - dest: /etc/postfix/dynamicmaps.cf.d/mysql + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/mysql' + - dest: /etc/postfix/dynamicmaps.cf.d/pcre + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/pcre' + - dest: /etc/postfix/postfix-files.d/ldap + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/ldap' + - dest: /etc/postfix/postfix-files.d/mysql + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/mysql' + - dest: /etc/postfix/postfix-files.d/pcre + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/pcre' + - dest: /etc/postfix/access + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/access' + - dest: /etc/postfix/canonical + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/canonical' + - dest: /etc/postfix/dynamicmaps.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf' + - dest: /etc/postfix/generic + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/generic' + - dest: /etc/postfix/header_checks + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/header_checks' + - dest: /etc/postfix/main.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/main.cf' + - dest: /etc/postfix/main.cf.proto + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/main.cf.proto' + - dest: /etc/postfix/master.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/master.cf' + - dest: /etc/postfix/master.cf.proto + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/master.cf.proto' + - dest: /etc/postfix/postfix-files + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files' + - dest: /etc/postfix/relocated + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/relocated' + - dest: /etc/postfix/transport + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/transport' + - dest: /etc/postfix/virtual + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/virtual' + - dest: /etc/opendkim/KeyTable + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/KeyTable' + - dest: /etc/opendkim/SigningTable + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/SigningTable' + - dest: /etc/opendkim/TrustedHosts + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/TrustedHosts' + - dest: /etc/opendkim.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim.conf' + - dest: /etc/opendmarc.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendmarc.conf' + - dest: /etc/opendmarc/ignore.hosts + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendmarc/ignore.hosts' + - dest: /usr/lib/systemd/system/postfix-copytls.service + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/postfix-copytls.service' + - dest: /usr/lib/systemd/system/postfix-copytls.timer + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/postfix-copytls.timer' diff --git a/roles/ensure_postfix/vars/Fedora-44-default.yml b/roles/ensure_postfix/vars/Fedora-44-default.yml index fb27efe..a53c17c 100644 --- a/roles/ensure_postfix/vars/Fedora-44-default.yml +++ b/roles/ensure_postfix/vars/Fedora-44-default.yml @@ -1,112 +1,138 @@ --- # vars file for ensure_postfix milter_list: - - description: 'OpenDKIM' - hostname: 'localhost' + - description: OpenDKIM + hostname: localhost port: '8891' - protocol: 'inet' - - description: 'OpenDMARC' - hostname: 'localhost' + protocol: inet + - description: OpenDMARC + hostname: localhost port: '8893' - protocol: 'inet' + protocol: inet package_list: - - name: 'opendkim' - state: 'present' - - name: 'opendkim-tools' - state: 'present' - - name: 'opendmarc' - state: 'present' - - name: 'postfix' - state: 'present' - - name: 'postfix-ldap' - state: 'present' - - name: 'postfix-mysql' - state: 'present' - - name: 'postfix-pcre' - state: 'present' - - name: 'spamass-milter' - state: 'present' - - name: 'spamassassin' - state: 'present' + - name: opendkim + state: present + - name: opendkim-tools + state: present + - name: opendmarc + state: present + - name: postfix + state: present + - name: postfix-ldap + state: present + - name: postfix-mysql + state: present + - name: postfix-pcre + state: present + - name: spamass-milter + state: present + - name: spamassassin + state: present firewall_list: - permanent: 'yes' - service: 'smtp' - state: 'enabled' + service: smtp + state: enabled - permanent: 'yes' - service: 'smtps' - state: 'enabled' + service: smtps + state: enabled - permanent: 'yes' - service: 'smtp-submission' - state: 'enabled' + service: smtp-submission + state: enabled service_list: - enabled: 'yes' - name: 'opendkim.service' - state: 'started' + name: opendkim.service + state: started - enabled: 'yes' - name: 'opendmarc.service' - state: 'started' + name: opendmarc.service + state: started - enabled: 'yes' - name: 'postfix.service' - state: 'started' + name: postfix.service + state: started - enabled: 'yes' - name: 'postfix-copytls.service' - state: 'started' + name: postfix-copytls.service + state: started - enabled: 'yes' - name: 'postfix-copytls.timer' - state: 'started' + name: postfix-copytls.timer + state: started template_list: - - dest: '/etc/postfix/dynamicmaps.cf.d/ldap' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/ldap' - - dest: '/etc/postfix/dynamicmaps.cf.d/mysql' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/mysql' - - dest: '/etc/postfix/dynamicmaps.cf.d/pcre' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf.d/pcre' - - dest: '/etc/postfix/postfix-files.d/ldap' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/ldap' - - dest: '/etc/postfix/postfix-files.d/mysql' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/mysql' - - dest: '/etc/postfix/postfix-files.d/pcre' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files.d/pcre' - - dest: '/etc/postfix/access' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/access' - - dest: '/etc/postfix/canonical' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/canonical' - - dest: '/etc/postfix/dynamicmaps.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/dynamicmaps.cf' - - dest: '/etc/postfix/generic' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/generic' - - dest: '/etc/postfix/header_checks' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/header_checks' - - dest: '/etc/postfix/main.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/main.cf' - - dest: '/etc/postfix/main.cf.proto' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/main.cf.proto' - - dest: '/etc/postfix/master.cf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/master.cf' - - dest: '/etc/postfix/master.cf.proto' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/master.cf.proto' - - dest: '/etc/postfix/postfix-files' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/postfix-files' - - dest: '/etc/postfix/relocated' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/relocated' - - dest: '/etc/postfix/transport' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/transport' - - dest: '/etc/postfix/virtual' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/postfix/virtual' - - dest: '/etc/opendkim/KeyTable' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/KeyTable' - - dest: '/etc/opendkim/SigningTable' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/SigningTable' - - dest: '/etc/opendkim/TrustedHosts' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim/TrustedHosts' - - dest: '/etc/opendkim.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendkim.conf' - - dest: '/etc/opendmarc.conf' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendmarc.conf' - - dest: '/etc/opendmarc/ignore.hosts' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/opendmarc/ignore.hosts' - - dest: '/usr/lib/systemd/system/postfix-copytls.service' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/postfix-copytls.service' - - dest: '/usr/lib/systemd/system/postfix-copytls.timer' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/usr/lib/systemd/system/postfix-copytls.timer' - + - dest: /etc/postfix/dynamicmaps.cf.d/ldap + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/ldap' + - dest: /etc/postfix/dynamicmaps.cf.d/mysql + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/mysql' + - dest: /etc/postfix/dynamicmaps.cf.d/pcre + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf.d/pcre' + - dest: /etc/postfix/postfix-files.d/ldap + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/ldap' + - dest: /etc/postfix/postfix-files.d/mysql + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/mysql' + - dest: /etc/postfix/postfix-files.d/pcre + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files.d/pcre' + - dest: /etc/postfix/access + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/access' + - dest: /etc/postfix/canonical + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/canonical' + - dest: /etc/postfix/dynamicmaps.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/dynamicmaps.cf' + - dest: /etc/postfix/generic + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/generic' + - dest: /etc/postfix/header_checks + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/header_checks' + - dest: /etc/postfix/main.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/main.cf' + - dest: /etc/postfix/main.cf.proto + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/main.cf.proto' + - dest: /etc/postfix/master.cf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/master.cf' + - dest: /etc/postfix/master.cf.proto + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/master.cf.proto' + - dest: /etc/postfix/postfix-files + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/postfix-files' + - dest: /etc/postfix/relocated + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/relocated' + - dest: /etc/postfix/transport + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/transport' + - dest: /etc/postfix/virtual + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/postfix/virtual' + - dest: /etc/opendkim/KeyTable + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/KeyTable' + - dest: /etc/opendkim/SigningTable + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/SigningTable' + - dest: /etc/opendkim/TrustedHosts + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim/TrustedHosts' + - dest: /etc/opendkim.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendkim.conf' + - dest: /etc/opendmarc.conf + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendmarc.conf' + - dest: /etc/opendmarc/ignore.hosts + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/opendmarc/ignore.hosts' + - dest: /usr/lib/systemd/system/postfix-copytls.service + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/postfix-copytls.service' + - dest: /usr/lib/systemd/system/postfix-copytls.timer + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/usr/lib/systemd/system/postfix-copytls.timer' diff --git a/roles/ensure_postfix/vars/default.yml b/roles/ensure_postfix/vars/default.yml index 9409913..91da2a7 100644 --- a/roles/ensure_postfix/vars/default.yml +++ b/roles/ensure_postfix/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_postfix \ No newline at end of file +... diff --git a/roles/ensure_postfix/vars/main.yml b/roles/ensure_postfix/vars/main.yml index 9409913..91da2a7 100644 --- a/roles/ensure_postfix/vars/main.yml +++ b/roles/ensure_postfix/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_postfix \ No newline at end of file +... diff --git a/roles/ensure_repo_epel/.travis.yml b/roles/ensure_repo_epel/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_repo_epel/.travis.yml +++ b/roles/ensure_repo_epel/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_repo_epel/defaults/main.yml b/roles/ensure_repo_epel/defaults/main.yml index 1781da7..91da2a7 100644 --- a/roles/ensure_repo_epel/defaults/main.yml +++ b/roles/ensure_repo_epel/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_repo_epel \ No newline at end of file +... diff --git a/roles/ensure_repo_epel/handlers/main.yml b/roles/ensure_repo_epel/handlers/main.yml index c19bb4c..787f49a 100644 --- a/roles/ensure_repo_epel/handlers/main.yml +++ b/roles/ensure_repo_epel/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_repo_epel -- name: 'ensure_repo_epel.package_facts' +- name: ensure_repo_epel.package_facts ansible.builtin.package_facts: -- name: 'ensure_repo_epel.service_facts' +- name: ensure_repo_epel.service_facts ansible.builtin.service_facts: -- name: 'ensure_repo_epel.service_reload' +- name: ensure_repo_epel.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_repo_epel is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_repo_epel.service_restart' +- name: ensure_repo_epel.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_repo_epel is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_repo_epel.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_repo_epel/meta/main.yml b/roles/ensure_repo_epel/meta/main.yml index 899f0ac..a53cfe5 100644 --- a/roles/ensure_repo_epel/meta/main.yml +++ b/roles/ensure_repo_epel/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensure EPEL on EL @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - diff --git a/roles/ensure_repo_epel/tasks/main.yml b/roles/ensure_repo_epel/tasks/main.yml index 90bccde..28eab8b 100644 --- a/roles/ensure_repo_epel/tasks/main.yml +++ b/roles/ensure_repo_epel/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_repo_epel -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_repo_epel' + name: ensure_repo_epel vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_repo_epel is defined @@ -43,10 +45,8 @@ loop: '{{ ensure_repo_epel.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_repo_epel.package_facts' - - 'ensure_repo_epel.service_facts' -- name: 'ensure services' + notify: [ensure_repo_epel.package_facts, ensure_repo_epel.service_facts] +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_repo_epel is defined @@ -59,10 +59,6 @@ loop: '{{ ensure_repo_epel.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_repo_epel.package_facts' - - 'ensure_repo_epel.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + notify: [ensure_repo_epel.package_facts, ensure_repo_epel.service_facts] +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_repo_epel/tests/test.yml b/roles/ensure_repo_epel/tests/test.yml index 18381e8..1c08ed9 100644 --- a/roles/ensure_repo_epel/tests/test.yml +++ b/roles/ensure_repo_epel/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_repo_epel + roles: [ensure_repo_epel] diff --git a/roles/ensure_repo_epel/vars/AlmaLinux-10-default.yml b/roles/ensure_repo_epel/vars/AlmaLinux-10-default.yml index 8e42308..c59a305 100644 --- a/roles/ensure_repo_epel/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_repo_epel/vars/AlmaLinux-10-default.yml @@ -2,7 +2,6 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'epel-release' - state: 'present' - url: 'epel-release' - + name: epel-release + state: present + url: epel-release diff --git a/roles/ensure_repo_epel/vars/AlmaLinux-9-default.yml b/roles/ensure_repo_epel/vars/AlmaLinux-9-default.yml index 8e42308..c59a305 100644 --- a/roles/ensure_repo_epel/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_repo_epel/vars/AlmaLinux-9-default.yml @@ -2,7 +2,6 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'epel-release' - state: 'present' - url: 'epel-release' - + name: epel-release + state: present + url: epel-release diff --git a/roles/ensure_repo_epel/vars/CentOS-10-default.yml b/roles/ensure_repo_epel/vars/CentOS-10-default.yml index 8e42308..c59a305 100644 --- a/roles/ensure_repo_epel/vars/CentOS-10-default.yml +++ b/roles/ensure_repo_epel/vars/CentOS-10-default.yml @@ -2,7 +2,6 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'epel-release' - state: 'present' - url: 'epel-release' - + name: epel-release + state: present + url: epel-release diff --git a/roles/ensure_repo_epel/vars/CentOS-9-default.yml b/roles/ensure_repo_epel/vars/CentOS-9-default.yml index 8e42308..c59a305 100644 --- a/roles/ensure_repo_epel/vars/CentOS-9-default.yml +++ b/roles/ensure_repo_epel/vars/CentOS-9-default.yml @@ -2,7 +2,6 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'epel-release' - state: 'present' - url: 'epel-release' - + name: epel-release + state: present + url: epel-release diff --git a/roles/ensure_repo_epel/vars/OracleLinux-10-default.yml b/roles/ensure_repo_epel/vars/OracleLinux-10-default.yml index 3059d32..cfdce35 100644 --- a/roles/ensure_repo_epel/vars/OracleLinux-10-default.yml +++ b/roles/ensure_repo_epel/vars/OracleLinux-10-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'oracle-epel-release-el10' - state: 'present' - url: 'oracle-epel-release-el10' + name: oracle-epel-release-el10 + state: present + url: oracle-epel-release-el10 - disable_gpg_check: 'yes' - name: 'oraclelinux-developer-release-el10' - state: 'present' - url: 'oraclelinux-developer-release-el10' - + name: oraclelinux-developer-release-el10 + state: present + url: oraclelinux-developer-release-el10 diff --git a/roles/ensure_repo_epel/vars/OracleLinux-9-default.yml b/roles/ensure_repo_epel/vars/OracleLinux-9-default.yml index 1911615..23ed8b3 100644 --- a/roles/ensure_repo_epel/vars/OracleLinux-9-default.yml +++ b/roles/ensure_repo_epel/vars/OracleLinux-9-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'oracle-epel-release-el9' - state: 'present' - url: 'oracle-epel-release-el9' + name: oracle-epel-release-el9 + state: present + url: oracle-epel-release-el9 - disable_gpg_check: 'yes' - name: 'oraclelinux-developer-release-el9' - state: 'present' - url: 'oraclelinux-developer-release-el9' - + name: oraclelinux-developer-release-el9 + state: present + url: oraclelinux-developer-release-el9 diff --git a/roles/ensure_repo_epel/vars/Rocky-10-default.yml b/roles/ensure_repo_epel/vars/Rocky-10-default.yml index 8e42308..c59a305 100644 --- a/roles/ensure_repo_epel/vars/Rocky-10-default.yml +++ b/roles/ensure_repo_epel/vars/Rocky-10-default.yml @@ -2,7 +2,6 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'epel-release' - state: 'present' - url: 'epel-release' - + name: epel-release + state: present + url: epel-release diff --git a/roles/ensure_repo_epel/vars/Rocky-9-default.yml b/roles/ensure_repo_epel/vars/Rocky-9-default.yml index 8e42308..c59a305 100644 --- a/roles/ensure_repo_epel/vars/Rocky-9-default.yml +++ b/roles/ensure_repo_epel/vars/Rocky-9-default.yml @@ -2,7 +2,6 @@ # vars file for ensure_repo_epel package_list: - disable_gpg_check: 'yes' - name: 'epel-release' - state: 'present' - url: 'epel-release' - + name: epel-release + state: present + url: epel-release diff --git a/roles/ensure_repo_epel/vars/default.yml b/roles/ensure_repo_epel/vars/default.yml index ebefd89..91da2a7 100644 --- a/roles/ensure_repo_epel/vars/default.yml +++ b/roles/ensure_repo_epel/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_repo_epel \ No newline at end of file +... diff --git a/roles/ensure_repo_epel/vars/main.yml b/roles/ensure_repo_epel/vars/main.yml index ebefd89..91da2a7 100644 --- a/roles/ensure_repo_epel/vars/main.yml +++ b/roles/ensure_repo_epel/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_repo_epel \ No newline at end of file +... diff --git a/roles/ensure_repo_rpmfusion/.travis.yml b/roles/ensure_repo_rpmfusion/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_repo_rpmfusion/.travis.yml +++ b/roles/ensure_repo_rpmfusion/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_repo_rpmfusion/defaults/main.yml b/roles/ensure_repo_rpmfusion/defaults/main.yml index 2857337..91da2a7 100644 --- a/roles/ensure_repo_rpmfusion/defaults/main.yml +++ b/roles/ensure_repo_rpmfusion/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for ensure_repo_rpmfusion \ No newline at end of file +... diff --git a/roles/ensure_repo_rpmfusion/handlers/main.yml b/roles/ensure_repo_rpmfusion/handlers/main.yml index ced89ce..6ea922e 100644 --- a/roles/ensure_repo_rpmfusion/handlers/main.yml +++ b/roles/ensure_repo_rpmfusion/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_repo_rpmfusion -- name: 'ensure_repo_rpmfusion.package_facts' +- name: ensure_repo_rpmfusion.package_facts ansible.builtin.package_facts: -- name: 'ensure_repo_rpmfusion.service_facts' +- name: ensure_repo_rpmfusion.service_facts ansible.builtin.service_facts: -- name: 'ensure_repo_rpmfusion.service_reload' +- name: ensure_repo_rpmfusion.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_repo_rpmfusion is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_repo_rpmfusion.service_restart' +- name: ensure_repo_rpmfusion.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_repo_rpmfusion is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_repo_rpmfusion.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_repo_rpmfusion/meta/main.yml b/roles/ensure_repo_rpmfusion/meta/main.yml index 27827e3..68ed948 100644 --- a/roles/ensure_repo_rpmfusion/meta/main.yml +++ b/roles/ensure_repo_rpmfusion/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Deploy RPM Fusion repo @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_repo_rpmfusion/tasks/main.yml b/roles/ensure_repo_rpmfusion/tasks/main.yml index ba2cef7..2876c56 100644 --- a/roles/ensure_repo_rpmfusion/tasks/main.yml +++ b/roles/ensure_repo_rpmfusion/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_repo_rpmfusion -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_repo_rpmfusion' + name: ensure_repo_rpmfusion vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_repo_rpmfusion is defined @@ -44,9 +46,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_repo_rpmfusion.package_facts' - - 'ensure_repo_rpmfusion.service_facts' -- name: 'ensure services' + - ensure_repo_rpmfusion.package_facts + - ensure_repo_rpmfusion.service_facts +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_repo_rpmfusion is defined @@ -60,9 +62,7 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_repo_rpmfusion.package_facts' - - 'ensure_repo_rpmfusion.service_facts' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... - + - ensure_repo_rpmfusion.package_facts + - ensure_repo_rpmfusion.service_facts +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_repo_rpmfusion/tests/test.yml b/roles/ensure_repo_rpmfusion/tests/test.yml index b1b8ed2..05e9be6 100644 --- a/roles/ensure_repo_rpmfusion/tests/test.yml +++ b/roles/ensure_repo_rpmfusion/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_repo_rpmfusion \ No newline at end of file + roles: [ensure_repo_rpmfusion] diff --git a/roles/ensure_repo_rpmfusion/vars/AlmaLinux-10-default.yml b/roles/ensure_repo_rpmfusion/vars/AlmaLinux-10-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/AlmaLinux-10-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/AlmaLinux-9-default.yml b/roles/ensure_repo_rpmfusion/vars/AlmaLinux-9-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/AlmaLinux-9-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/CentOS-10-default.yml b/roles/ensure_repo_rpmfusion/vars/CentOS-10-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/CentOS-10-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/CentOS-10-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/CentOS-9-default.yml b/roles/ensure_repo_rpmfusion/vars/CentOS-9-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/CentOS-9-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/CentOS-9-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/Fedora-42-default.yml b/roles/ensure_repo_rpmfusion/vars/Fedora-42-default.yml index f79ad8f..f142bf9 100644 --- a/roles/ensure_repo_rpmfusion/vars/Fedora-42-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/Fedora-42-default.yml @@ -2,10 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/Fedora-43-default.yml b/roles/ensure_repo_rpmfusion/vars/Fedora-43-default.yml index f79ad8f..f142bf9 100644 --- a/roles/ensure_repo_rpmfusion/vars/Fedora-43-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/Fedora-43-default.yml @@ -2,10 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/Fedora-44-default.yml b/roles/ensure_repo_rpmfusion/vars/Fedora-44-default.yml index f79ad8f..f142bf9 100644 --- a/roles/ensure_repo_rpmfusion/vars/Fedora-44-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/Fedora-44-default.yml @@ -2,10 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/OracleLinux-10-default.yml b/roles/ensure_repo_rpmfusion/vars/OracleLinux-10-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/OracleLinux-10-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/OracleLinux-10-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/OracleLinux-9-default.yml b/roles/ensure_repo_rpmfusion/vars/OracleLinux-9-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/OracleLinux-9-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/OracleLinux-9-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/Rocky-10-default.yml b/roles/ensure_repo_rpmfusion/vars/Rocky-10-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/Rocky-10-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/Rocky-10-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/Rocky-9-default.yml b/roles/ensure_repo_rpmfusion/vars/Rocky-9-default.yml index ac6b851..3083c75 100644 --- a/roles/ensure_repo_rpmfusion/vars/Rocky-9-default.yml +++ b/roles/ensure_repo_rpmfusion/vars/Rocky-9-default.yml @@ -2,11 +2,10 @@ # vars file for ensure_repo_rpmfusion package_list: - disable_gpg_check: 'yes' - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + name: rpmfusion-free-release + state: present + url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm - disable_gpg_check: 'yes' - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - + name: rpmfusion-nonfree-release + state: present + url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm diff --git a/roles/ensure_repo_rpmfusion/vars/default.yml b/roles/ensure_repo_rpmfusion/vars/default.yml index 0a9d6d9..91da2a7 100644 --- a/roles/ensure_repo_rpmfusion/vars/default.yml +++ b/roles/ensure_repo_rpmfusion/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_repo_rpmfusion \ No newline at end of file +... diff --git a/roles/ensure_repo_rpmfusion/vars/main.yml b/roles/ensure_repo_rpmfusion/vars/main.yml index 56e2119..91da2a7 100644 --- a/roles/ensure_repo_rpmfusion/vars/main.yml +++ b/roles/ensure_repo_rpmfusion/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_repo_rpmfusion +... diff --git a/roles/ensure_rsync/defaults/main.yml b/roles/ensure_rsync/defaults/main.yml index 26596d0..91da2a7 100644 --- a/roles/ensure_rsync/defaults/main.yml +++ b/roles/ensure_rsync/defaults/main.yml @@ -1,3 +1,2 @@ --- -# defaults file for ensure_rsync - +... diff --git a/roles/ensure_rsync/handlers/main.yml b/roles/ensure_rsync/handlers/main.yml index 7839582..e0c8fb8 100644 --- a/roles/ensure_rsync/handlers/main.yml +++ b/roles/ensure_rsync/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_rsync -- name: 'ensure_rsync.package_facts' +- name: ensure_rsync.package_facts ansible.builtin.package_facts: -- name: 'ensure_rsync.service_facts' +- name: ensure_rsync.service_facts ansible.builtin.service_facts: -- name: 'ensure_rsync.service_reload' +- name: ensure_rsync.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_rsync is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_rsync.service_restart' +- name: ensure_rsync.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_rsync is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_rsync.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_rsync/meta/main.yml b/roles/ensure_rsync/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_rsync/meta/main.yml +++ b/roles/ensure_rsync/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_rsync/tasks/main.yml b/roles/ensure_rsync/tasks/main.yml index 6b3d76a..ce5a9a5 100644 --- a/roles/ensure_rsync/tasks/main.yml +++ b/roles/ensure_rsync/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_rsync -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_rsync' + name: ensure_rsync vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_rsync is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_rsync.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_rsync.package_facts' - - 'ensure_rsync.service_facts' -- name: 'ensure configurations' + notify: [ensure_rsync.package_facts, ensure_rsync.service_facts] +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_rsync is defined @@ -65,11 +65,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_rsync.package_facts' - - 'ensure_rsync.service_facts' - - 'ensure_rsync.service_reload' - - 'ensure_rsync.service_restart' -- name: 'ensure services' + - ensure_rsync.package_facts + - ensure_rsync.service_facts + - ensure_rsync.service_reload + - ensure_rsync.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_rsync is defined @@ -82,10 +82,8 @@ loop: '{{ ensure_rsync.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_rsync.package_facts' - - 'ensure_rsync.service_facts' -- name: 'Ensure SELinux is configured' + notify: [ensure_rsync.package_facts, ensure_rsync.service_facts] +- name: Ensure SELinux is configured when: - ansible_facts["system"] == 'Linux' - ensure_rsync is defined @@ -94,23 +92,23 @@ ansible.posix.selinux: policy: '{{ ensure_rsync.selinux_policy }}' state: '{{ ensure_rsync.selinux_state }}' - register: 'ensure_rsync_results' + register: ensure_rsync_results notify: - - 'ensure_rsync.package_facts' - - 'ensure_rsync.service_facts' - - 'ensure_rsync.service_reload' - - 'ensure_rsync.service_restart' -- name: 'Reboot if required' + - ensure_rsync.package_facts + - ensure_rsync.service_facts + - ensure_rsync.service_reload + - ensure_rsync.service_restart +- name: Reboot if required when: - ansible_facts["system"] == 'Linux' - ensure_rsync is defined - ensure_rsync.selinux_policy is defined - - ensure_rsync.selinux_state is defined # This line is correct, no change needed + - ensure_rsync.selinux_state is defined # This line is correct, no change needed - ensure_rsync_results is defined - ensure_rsync_results.reboot_required is defined - ensure_rsync_results.reboot_required ansible.builtin.reboot: -- name: 'ensure seboolean' +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_rsync is defined @@ -124,10 +122,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_rsync.package_facts' - - 'ensure_rsync.service_facts' - - 'ensure_rsync.service_reload' - - 'ensure_rsync.service_restart' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... + - ensure_rsync.package_facts + - ensure_rsync.service_facts + - ensure_rsync.service_reload + - ensure_rsync.service_restart +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_rsync/tests/test.yml b/roles/ensure_rsync/tests/test.yml index 5165d44..738429e 100644 --- a/roles/ensure_rsync/tests/test.yml +++ b/roles/ensure_rsync/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_rsync \ No newline at end of file + roles: [ensure_rsync] diff --git a/roles/ensure_rsync/vars/AlmaLinux-10-default.yml b/roles/ensure_rsync/vars/AlmaLinux-10-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_rsync/vars/AlmaLinux-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/AlmaLinux-9-default.yml b/roles/ensure_rsync/vars/AlmaLinux-9-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_rsync/vars/AlmaLinux-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/CentOS-10-default.yml b/roles/ensure_rsync/vars/CentOS-10-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/CentOS-10-default.yml +++ b/roles/ensure_rsync/vars/CentOS-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/CentOS-9-default.yml b/roles/ensure_rsync/vars/CentOS-9-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/CentOS-9-default.yml +++ b/roles/ensure_rsync/vars/CentOS-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Debian-11-default.yml b/roles/ensure_rsync/vars/Debian-11-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Debian-11-default.yml +++ b/roles/ensure_rsync/vars/Debian-11-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Debian-12-default.yml b/roles/ensure_rsync/vars/Debian-12-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Debian-12-default.yml +++ b/roles/ensure_rsync/vars/Debian-12-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Debian-13-default.yml b/roles/ensure_rsync/vars/Debian-13-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Debian-13-default.yml +++ b/roles/ensure_rsync/vars/Debian-13-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Fedora-42-default.yml b/roles/ensure_rsync/vars/Fedora-42-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Fedora-42-default.yml +++ b/roles/ensure_rsync/vars/Fedora-42-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Fedora-43-default.yml b/roles/ensure_rsync/vars/Fedora-43-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Fedora-43-default.yml +++ b/roles/ensure_rsync/vars/Fedora-43-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Fedora-44-default.yml b/roles/ensure_rsync/vars/Fedora-44-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Fedora-44-default.yml +++ b/roles/ensure_rsync/vars/Fedora-44-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/OracleLinux-10-default.yml b/roles/ensure_rsync/vars/OracleLinux-10-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/OracleLinux-10-default.yml +++ b/roles/ensure_rsync/vars/OracleLinux-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/OracleLinux-9-default.yml b/roles/ensure_rsync/vars/OracleLinux-9-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/OracleLinux-9-default.yml +++ b/roles/ensure_rsync/vars/OracleLinux-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Rocky-10-default.yml b/roles/ensure_rsync/vars/Rocky-10-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Rocky-10-default.yml +++ b/roles/ensure_rsync/vars/Rocky-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Rocky-9-default.yml b/roles/ensure_rsync/vars/Rocky-9-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Rocky-9-default.yml +++ b/roles/ensure_rsync/vars/Rocky-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Ubuntu-22-default.yml b/roles/ensure_rsync/vars/Ubuntu-22-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Ubuntu-22-default.yml +++ b/roles/ensure_rsync/vars/Ubuntu-22-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Ubuntu-24-default.yml b/roles/ensure_rsync/vars/Ubuntu-24-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Ubuntu-24-default.yml +++ b/roles/ensure_rsync/vars/Ubuntu-24-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/Ubuntu-26-default.yml b/roles/ensure_rsync/vars/Ubuntu-26-default.yml index c60b5f2..1831c12 100644 --- a/roles/ensure_rsync/vars/Ubuntu-26-default.yml +++ b/roles/ensure_rsync/vars/Ubuntu-26-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_rsync package_list: - - name: 'rsync' - state: 'present' -... - + - name: rsync + state: present diff --git a/roles/ensure_rsync/vars/default.yml b/roles/ensure_rsync/vars/default.yml index 71d0f6d..91da2a7 100644 --- a/roles/ensure_rsync/vars/default.yml +++ b/roles/ensure_rsync/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_rsync \ No newline at end of file +... diff --git a/roles/ensure_rsync/vars/main.yml b/roles/ensure_rsync/vars/main.yml index 71d0f6d..91da2a7 100644 --- a/roles/ensure_rsync/vars/main.yml +++ b/roles/ensure_rsync/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_rsync \ No newline at end of file +... diff --git a/roles/ensure_selinux/.travis.yml b/roles/ensure_selinux/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_selinux/.travis.yml +++ b/roles/ensure_selinux/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_selinux/defaults/main.yml b/roles/ensure_selinux/defaults/main.yml index e266585..91da2a7 100644 --- a/roles/ensure_selinux/defaults/main.yml +++ b/roles/ensure_selinux/defaults/main.yml @@ -1,3 +1,2 @@ --- -# defaults file for ensure_selinux - +... diff --git a/roles/ensure_selinux/handlers/main.yml b/roles/ensure_selinux/handlers/main.yml index b3a862e..fb1cc79 100644 --- a/roles/ensure_selinux/handlers/main.yml +++ b/roles/ensure_selinux/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_selinux -- name: 'ensure_selinux.package_facts' +- name: ensure_selinux.package_facts ansible.builtin.package_facts: -- name: 'ensure_selinux.service_facts' +- name: ensure_selinux.service_facts ansible.builtin.service_facts: -- name: 'ensure_selinux.service_reload' +- name: ensure_selinux.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_selinux is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_selinux.service_restart' +- name: ensure_selinux.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_selinux is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_selinux.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_selinux/meta/main.yml b/roles/ensure_selinux/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_selinux/meta/main.yml +++ b/roles/ensure_selinux/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_selinux/tasks/main.yml b/roles/ensure_selinux/tasks/main.yml index 822e0b3..61a1ae1 100644 --- a/roles/ensure_selinux/tasks/main.yml +++ b/roles/ensure_selinux/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_selinux -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_selinux' + name: ensure_selinux vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_selinux is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_selinux.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_selinux.package_facts' - - 'ensure_selinux.service_facts' -- name: 'ensure configurations' + notify: [ensure_selinux.package_facts, ensure_selinux.service_facts] +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_selinux is defined @@ -65,11 +65,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_selinux.package_facts' - - 'ensure_selinux.service_facts' - - 'ensure_selinux.service_reload' - - 'ensure_selinux.service_restart' -- name: 'ensure services' + - ensure_selinux.package_facts + - ensure_selinux.service_facts + - ensure_selinux.service_reload + - ensure_selinux.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_selinux is defined @@ -82,10 +82,8 @@ loop: '{{ ensure_selinux.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_selinux.package_facts' - - 'ensure_selinux.service_facts' -- name: 'Ensure SELinux is configured' + notify: [ensure_selinux.package_facts, ensure_selinux.service_facts] +- name: Ensure SELinux is configured when: - ansible_facts["system"] == 'Linux' - ensure_selinux is defined @@ -94,8 +92,8 @@ ansible.posix.selinux: policy: '{{ ensure_selinux.selinux_policy }}' state: '{{ ensure_selinux.selinux_state }}' - register: 'ensure_selinux_results' -- name: 'Reboot if required' + register: ensure_selinux_results +- name: Reboot if required when: - ansible_facts["system"] == 'Linux' - ensure_selinux is defined @@ -105,7 +103,7 @@ - ensure_selinux_results.reboot_required is defined - ensure_selinux_results.reboot_required ansible.builtin.reboot: -- name: 'ensure seboolean' +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_selinux is defined @@ -118,6 +116,5 @@ loop: '{{ ensure_selinux.seboolean_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_selinux/tests/test.yml b/roles/ensure_selinux/tests/test.yml index 502e724..2723ef5 100644 --- a/roles/ensure_selinux/tests/test.yml +++ b/roles/ensure_selinux/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_selinux \ No newline at end of file + roles: [ensure_selinux] diff --git a/roles/ensure_selinux/vars/AlmaLinux-10-default.yml b/roles/ensure_selinux/vars/AlmaLinux-10-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_selinux/vars/AlmaLinux-10-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/AlmaLinux-9-default.yml b/roles/ensure_selinux/vars/AlmaLinux-9-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_selinux/vars/AlmaLinux-9-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/CentOS-10-default.yml b/roles/ensure_selinux/vars/CentOS-10-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/CentOS-10-default.yml +++ b/roles/ensure_selinux/vars/CentOS-10-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/CentOS-9-default.yml b/roles/ensure_selinux/vars/CentOS-9-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/CentOS-9-default.yml +++ b/roles/ensure_selinux/vars/CentOS-9-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/Fedora-42-default.yml b/roles/ensure_selinux/vars/Fedora-42-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/Fedora-42-default.yml +++ b/roles/ensure_selinux/vars/Fedora-42-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/Fedora-43-default.yml b/roles/ensure_selinux/vars/Fedora-43-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/Fedora-43-default.yml +++ b/roles/ensure_selinux/vars/Fedora-43-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/Fedora-44-default.yml b/roles/ensure_selinux/vars/Fedora-44-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/Fedora-44-default.yml +++ b/roles/ensure_selinux/vars/Fedora-44-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/OracleLinux-10-default.yml b/roles/ensure_selinux/vars/OracleLinux-10-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/OracleLinux-10-default.yml +++ b/roles/ensure_selinux/vars/OracleLinux-10-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/OracleLinux-9-default.yml b/roles/ensure_selinux/vars/OracleLinux-9-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/OracleLinux-9-default.yml +++ b/roles/ensure_selinux/vars/OracleLinux-9-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/Rocky-10-default.yml b/roles/ensure_selinux/vars/Rocky-10-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/Rocky-10-default.yml +++ b/roles/ensure_selinux/vars/Rocky-10-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/Rocky-9-default.yml b/roles/ensure_selinux/vars/Rocky-9-default.yml index b16597b..4865779 100644 --- a/roles/ensure_selinux/vars/Rocky-9-default.yml +++ b/roles/ensure_selinux/vars/Rocky-9-default.yml @@ -1,9 +1,9 @@ --- # vars file for ensure_selinux package_list: - - name: 'python3-libselinux' - state: 'present' - - name: 'python3-libsemanage' - state: 'present' -selinux_policy: 'targeted' -selinux_state: 'enforcing' + - name: python3-libselinux + state: present + - name: python3-libsemanage + state: present +selinux_policy: targeted +selinux_state: enforcing diff --git a/roles/ensure_selinux/vars/default.yml b/roles/ensure_selinux/vars/default.yml index e6ae2d5..91da2a7 100644 --- a/roles/ensure_selinux/vars/default.yml +++ b/roles/ensure_selinux/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_selinux \ No newline at end of file +... diff --git a/roles/ensure_selinux/vars/main.yml b/roles/ensure_selinux/vars/main.yml index e6ae2d5..91da2a7 100644 --- a/roles/ensure_selinux/vars/main.yml +++ b/roles/ensure_selinux/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_selinux \ No newline at end of file +... diff --git a/roles/ensure_sudo/.travis.yml b/roles/ensure_sudo/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_sudo/.travis.yml +++ b/roles/ensure_sudo/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_sudo/defaults/main.yml b/roles/ensure_sudo/defaults/main.yml index ab081a4..24fcb42 100644 --- a/roles/ensure_sudo/defaults/main.yml +++ b/roles/ensure_sudo/defaults/main.yml @@ -1,4 +1,3 @@ --- # defaults file for ensure_sudo -sudo_log_retention: '90d' - +sudo_log_retention: 90d diff --git a/roles/ensure_sudo/handlers/main.yml b/roles/ensure_sudo/handlers/main.yml index 7be4b30..5609bda 100644 --- a/roles/ensure_sudo/handlers/main.yml +++ b/roles/ensure_sudo/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_sudo -- name: 'ensure_sudo.package_facts' +- name: ensure_sudo.package_facts ansible.builtin.package_facts: -- name: 'ensure_sudo.service_facts' +- name: ensure_sudo.service_facts ansible.builtin.service_facts: -- name: 'ensure_sudo.service_reload' +- name: ensure_sudo.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_sudo is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_sudo.service_restart' +- name: ensure_sudo.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_sudo is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_sudo.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_sudo/meta/main.yml b/roles/ensure_sudo/meta/main.yml index 098dde1..a5508b8 100644 --- a/roles/ensure_sudo/meta/main.yml +++ b/roles/ensure_sudo/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensure sudo configuration @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - diff --git a/roles/ensure_sudo/tasks/main.yml b/roles/ensure_sudo/tasks/main.yml index a740214..2e1bb41 100644 --- a/roles/ensure_sudo/tasks/main.yml +++ b/roles/ensure_sudo/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_sudo -- name: 'include vendor / version specific variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include vendor / version specific variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_sudo' + name: ensure_sudo vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_sudo is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_sudo.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_sudo.package_facts' - - 'ensure_sudo.service_facts' -- name: 'ensure configurations' + notify: [ensure_sudo.package_facts, ensure_sudo.service_facts] +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_sudo is defined @@ -65,11 +65,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_sudo.package_facts' - - 'ensure_sudo.service_facts' - - 'ensure_sudo.service_reload' - - 'ensure_sudo.service_restart' -- name: 'ensure services' + - ensure_sudo.package_facts + - ensure_sudo.service_facts + - ensure_sudo.service_reload + - ensure_sudo.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_sudo is defined @@ -82,10 +82,8 @@ loop: '{{ ensure_sudo.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_sudo.package_facts' - - 'ensure_sudo.service_facts' -- name: 'find directories over log retention window under /var/log/sudo-io' + notify: [ensure_sudo.package_facts, ensure_sudo.service_facts] +- name: find directories over log retention window under /var/log/sudo-io when: - ansible_facts["system"] == 'Linux' - ensure_sudo is defined @@ -93,13 +91,12 @@ - sudo_log_retention is regex('^[0-9]*[smhdw]$') ansible.builtin.find: age: '{{ sudo_log_retention }}' - file_type: 'directory' + file_type: directory follow: 'no' - paths: - - '/var/log/sudo-io/' + paths: [/var/log/sudo-io/] recurse: 'yes' - register: 'ensure_sudo_results' -- name: 'And drop them' + register: ensure_sudo_results +- name: And drop them when: - ansible_facts["system"] == 'Linux' - ensure_sudo is defined @@ -108,10 +105,9 @@ - item.path is regex('^/var/log/sudo-io/([0-9]|[A-Z])([0-9]|[A-Z])/([0-9]|[A-Z])([0-9]|[A-Z])/([0-9]|[A-Z])([0-9]|[A-Z])$') ansible.builtin.file: path: '{{ item.path }}' - state: 'absent' + state: absent loop: '{{ ensure_sudo_results.files }}' loop_control: label: '{{ item.path }} to be removed' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_sudo/tests/test.yml b/roles/ensure_sudo/tests/test.yml index 0f5704c..272601e 100644 --- a/roles/ensure_sudo/tests/test.yml +++ b/roles/ensure_sudo/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_sudo \ No newline at end of file + roles: [ensure_sudo] diff --git a/roles/ensure_sudo/vars/AlmaLinux-10-default.yml b/roles/ensure_sudo/vars/AlmaLinux-10-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_sudo/vars/AlmaLinux-10-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/AlmaLinux-9-default.yml b/roles/ensure_sudo/vars/AlmaLinux-9-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_sudo/vars/AlmaLinux-9-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/CentOS-10-default.yml b/roles/ensure_sudo/vars/CentOS-10-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/CentOS-10-default.yml +++ b/roles/ensure_sudo/vars/CentOS-10-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/CentOS-9-default.yml b/roles/ensure_sudo/vars/CentOS-9-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/CentOS-9-default.yml +++ b/roles/ensure_sudo/vars/CentOS-9-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/Fedora-42-default.yml b/roles/ensure_sudo/vars/Fedora-42-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/Fedora-42-default.yml +++ b/roles/ensure_sudo/vars/Fedora-42-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/Fedora-43-default.yml b/roles/ensure_sudo/vars/Fedora-43-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/Fedora-43-default.yml +++ b/roles/ensure_sudo/vars/Fedora-43-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/Fedora-44-default.yml b/roles/ensure_sudo/vars/Fedora-44-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/Fedora-44-default.yml +++ b/roles/ensure_sudo/vars/Fedora-44-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/OracleLinux-10-default.yml b/roles/ensure_sudo/vars/OracleLinux-10-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/OracleLinux-10-default.yml +++ b/roles/ensure_sudo/vars/OracleLinux-10-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/OracleLinux-9-default.yml b/roles/ensure_sudo/vars/OracleLinux-9-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/OracleLinux-9-default.yml +++ b/roles/ensure_sudo/vars/OracleLinux-9-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/Rocky-10-default.yml b/roles/ensure_sudo/vars/Rocky-10-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/Rocky-10-default.yml +++ b/roles/ensure_sudo/vars/Rocky-10-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/Rocky-9-default.yml b/roles/ensure_sudo/vars/Rocky-9-default.yml index 033c586..8a4080d 100644 --- a/roles/ensure_sudo/vars/Rocky-9-default.yml +++ b/roles/ensure_sudo/vars/Rocky-9-default.yml @@ -1,40 +1,44 @@ --- # vars file for ensure_sudo package_list: - - name: 'libsss_sudo' - state: 'present' - - name: 'sudo' - state: 'present' + - name: libsss_sudo + state: present + - name: sudo + state: present template_list: - - dest: '/etc/dnf/protected.d/sudo.conf' - group: 'root' + - dest: /etc/dnf/protected.d/sudo.conf + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/dnf/protected.d/sudo.conf' - - dest: '/etc/pam.d/sudo' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/dnf/protected.d/sudo.conf' + - dest: /etc/pam.d/sudo + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo' - - dest: '/etc/pam.d/sudo-i' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo' + - dest: /etc/pam.d/sudo-i + group: root mode: '0644' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/pam.d/sudo-i' - - dest: '/etc/sudo.conf' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/pam.d/sudo-i' + - dest: /etc/sudo.conf + group: root mode: '0640' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudo.conf' - - dest: '/etc/sudoers' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudo.conf' + - dest: /etc/sudoers + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers' - - dest: '/etc/sudoers.d/session_log' - group: 'root' + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers' + - dest: /etc/sudoers.d/session_log + group: root mode: '0440' - owner: 'root' - src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] }}/etc/sudoers.d/session_log.j2' -... - + owner: root + src: '{{ ansible_facts["distribution"] }}/{{ ansible_facts["distribution_major_version"] + }}/etc/sudoers.d/session_log.j2' diff --git a/roles/ensure_sudo/vars/default.yml b/roles/ensure_sudo/vars/default.yml index 4744a45..91da2a7 100644 --- a/roles/ensure_sudo/vars/default.yml +++ b/roles/ensure_sudo/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_sudo \ No newline at end of file +... diff --git a/roles/ensure_sudo/vars/main.yml b/roles/ensure_sudo/vars/main.yml index 9ae18b3..91da2a7 100644 --- a/roles/ensure_sudo/vars/main.yml +++ b/roles/ensure_sudo/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_sudo +... diff --git a/roles/ensure_timezone/.travis.yml b/roles/ensure_timezone/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_timezone/.travis.yml +++ b/roles/ensure_timezone/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_timezone/defaults/main.yml b/roles/ensure_timezone/defaults/main.yml index 4504986..7b15971 100644 --- a/roles/ensure_timezone/defaults/main.yml +++ b/roles/ensure_timezone/defaults/main.yml @@ -1,5 +1,4 @@ --- # defaults file for ensure_timezone -timezone_hwclock: 'UTC' -timezone_name: 'UTC' - +timezone_hwclock: UTC +timezone_name: UTC diff --git a/roles/ensure_timezone/handlers/main.yml b/roles/ensure_timezone/handlers/main.yml index f69d338..39c8181 100644 --- a/roles/ensure_timezone/handlers/main.yml +++ b/roles/ensure_timezone/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_timezone -- name: 'ensure_timezone.package_facts' +- name: ensure_timezone.package_facts ansible.builtin.package_facts: -- name: 'ensure_timezone.service_facts' +- name: ensure_timezone.service_facts ansible.builtin.service_facts: -- name: 'ensure_timezone.service_reload' +- name: ensure_timezone.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_timezone is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_timezone.service_restart' +- name: ensure_timezone.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_timezone is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_timezone.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_timezone/meta/main.yml b/roles/ensure_timezone/meta/main.yml index b8d6c36..1ac0950 100644 --- a/roles/ensure_timezone/meta/main.yml +++ b/roles/ensure_timezone/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Jason Rothstein description: Ensure time zone is configured, and cron restarted if there is a change @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: LGPL-3.0-or-later - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - diff --git a/roles/ensure_timezone/tasks/main.yml b/roles/ensure_timezone/tasks/main.yml index 838b030..0952ea8 100644 --- a/roles/ensure_timezone/tasks/main.yml +++ b/roles/ensure_timezone/tasks/main.yml @@ -1,43 +1,45 @@ --- # tasks file for ensure_timezone -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_timezone' + name: ensure_timezone vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'Set timezone' +- name: Set timezone community.general.timezone: hwclock: '{{ timezone_hwclock }}' name: '{{ timezone_name }}' notify: - - 'ensure_timezone.package_facts' - - 'ensure_timezone.service_facts' - - 'ensure_timezone.service_restart' -- name: 'ensure packages' + - ensure_timezone.package_facts + - ensure_timezone.service_facts + - ensure_timezone.service_restart +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_timezone is defined @@ -49,10 +51,8 @@ loop: '{{ ensure_timezone.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_timezone.package_facts' - - 'ensure_timezone.service_facts' -- name: 'ensure configurations' + notify: [ensure_timezone.package_facts, ensure_timezone.service_facts] +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_timezone is defined @@ -73,11 +73,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_timezone.package_facts' - - 'ensure_timezone.service_facts' - - 'ensure_timezone.service_reload' - - 'ensure_timezone.service_restart' -- name: 'ensure services' + - ensure_timezone.package_facts + - ensure_timezone.service_facts + - ensure_timezone.service_reload + - ensure_timezone.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_timezone is defined @@ -90,10 +90,8 @@ loop: '{{ ensure_timezone.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_timezone.package_facts' - - 'ensure_timezone.service_facts' -- name: 'Ensure SELinux is configured' + notify: [ensure_timezone.package_facts, ensure_timezone.service_facts] +- name: Ensure SELinux is configured when: - ansible_facts["system"] == 'Linux' - ensure_timezone is defined @@ -102,8 +100,8 @@ ansible.posix.selinux: policy: '{{ ensure_timezone.selinux_policy }}' state: '{{ ensure_timezone.selinux_state }}' - register: 'ensure_timezone_results' -- name: 'Reboot if required' + register: ensure_timezone_results +- name: Reboot if required when: - ansible_facts["system"] == 'Linux' - ensure_timezone is defined @@ -113,7 +111,7 @@ - ensure_timezone_results.reboot_required is defined - ensure_timezone_results.reboot_required ansible.builtin.reboot: -- name: 'ensure seboolean' +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_timezone is defined @@ -126,6 +124,5 @@ loop: '{{ ensure_timezone.seboolean_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_timezone/tests/test.yml b/roles/ensure_timezone/tests/test.yml index 917a267..f93c220 100644 --- a/roles/ensure_timezone/tests/test.yml +++ b/roles/ensure_timezone/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_timezone \ No newline at end of file + roles: [ensure_timezone] diff --git a/roles/ensure_timezone/vars/AlmaLinux-10-default.yml b/roles/ensure_timezone/vars/AlmaLinux-10-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_timezone/vars/AlmaLinux-10-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/AlmaLinux-9-default.yml b/roles/ensure_timezone/vars/AlmaLinux-9-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_timezone/vars/AlmaLinux-9-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/CentOS-10-default.yml b/roles/ensure_timezone/vars/CentOS-10-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/CentOS-10-default.yml +++ b/roles/ensure_timezone/vars/CentOS-10-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/CentOS-9-default.yml b/roles/ensure_timezone/vars/CentOS-9-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/CentOS-9-default.yml +++ b/roles/ensure_timezone/vars/CentOS-9-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/Debian-11-default.yml b/roles/ensure_timezone/vars/Debian-11-default.yml index bf9898b..34288c9 100644 --- a/roles/ensure_timezone/vars/Debian-11-default.yml +++ b/roles/ensure_timezone/vars/Debian-11-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'cron.service' - state: 'started' -... - + name: cron.service + state: started diff --git a/roles/ensure_timezone/vars/Debian-12-default.yml b/roles/ensure_timezone/vars/Debian-12-default.yml index bf9898b..34288c9 100644 --- a/roles/ensure_timezone/vars/Debian-12-default.yml +++ b/roles/ensure_timezone/vars/Debian-12-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'cron.service' - state: 'started' -... - + name: cron.service + state: started diff --git a/roles/ensure_timezone/vars/Debian-13-default.yml b/roles/ensure_timezone/vars/Debian-13-default.yml index bf9898b..34288c9 100644 --- a/roles/ensure_timezone/vars/Debian-13-default.yml +++ b/roles/ensure_timezone/vars/Debian-13-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'cron.service' - state: 'started' -... - + name: cron.service + state: started diff --git a/roles/ensure_timezone/vars/Fedora-42-default.yml b/roles/ensure_timezone/vars/Fedora-42-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/Fedora-42-default.yml +++ b/roles/ensure_timezone/vars/Fedora-42-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/Fedora-43-default.yml b/roles/ensure_timezone/vars/Fedora-43-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/Fedora-43-default.yml +++ b/roles/ensure_timezone/vars/Fedora-43-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/Fedora-44-default.yml b/roles/ensure_timezone/vars/Fedora-44-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/Fedora-44-default.yml +++ b/roles/ensure_timezone/vars/Fedora-44-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/OracleLinux-10-default.yml b/roles/ensure_timezone/vars/OracleLinux-10-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/OracleLinux-10-default.yml +++ b/roles/ensure_timezone/vars/OracleLinux-10-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/OracleLinux-9-default.yml b/roles/ensure_timezone/vars/OracleLinux-9-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/OracleLinux-9-default.yml +++ b/roles/ensure_timezone/vars/OracleLinux-9-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/Rocky-10-default.yml b/roles/ensure_timezone/vars/Rocky-10-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/Rocky-10-default.yml +++ b/roles/ensure_timezone/vars/Rocky-10-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/Rocky-9-default.yml b/roles/ensure_timezone/vars/Rocky-9-default.yml index 986a453..fe0192d 100644 --- a/roles/ensure_timezone/vars/Rocky-9-default.yml +++ b/roles/ensure_timezone/vars/Rocky-9-default.yml @@ -2,7 +2,5 @@ # vars file for ensure_timezone service_list: - enabled: 'yes' - name: 'crond.service' - state: 'started' -... - + name: crond.service + state: started diff --git a/roles/ensure_timezone/vars/default.yml b/roles/ensure_timezone/vars/default.yml index 7c16b44..91da2a7 100644 --- a/roles/ensure_timezone/vars/default.yml +++ b/roles/ensure_timezone/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_timezone \ No newline at end of file +... diff --git a/roles/ensure_timezone/vars/main.yml b/roles/ensure_timezone/vars/main.yml index 7c16b44..91da2a7 100644 --- a/roles/ensure_timezone/vars/main.yml +++ b/roles/ensure_timezone/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_timezone \ No newline at end of file +... diff --git a/roles/ensure_vim/.travis.yml b/roles/ensure_vim/.travis.yml index 36bbf62..c8c6112 100644 --- a/roles/ensure_vim/.travis.yml +++ b/roles/ensure_vim/.travis.yml @@ -1,16 +1,13 @@ --- language: python -python: "2.7" +python: '2.7' # Use the new container infrastructure sudo: false - # Install ansible addons: apt: - packages: - - python-pip - + packages: [python-pip] install: # Install ansible - pip install ansible @@ -20,10 +17,8 @@ install: # Create ansible.cfg with correct roles_path - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Basic role syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file + webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/roles/ensure_vim/defaults/main.yml b/roles/ensure_vim/defaults/main.yml index f0fcc22..91da2a7 100644 --- a/roles/ensure_vim/defaults/main.yml +++ b/roles/ensure_vim/defaults/main.yml @@ -1,3 +1,2 @@ --- -# defaults file for ensure_vim - +... diff --git a/roles/ensure_vim/handlers/main.yml b/roles/ensure_vim/handlers/main.yml index aca65b1..ea5bb25 100644 --- a/roles/ensure_vim/handlers/main.yml +++ b/roles/ensure_vim/handlers/main.yml @@ -1,17 +1,17 @@ --- # handlers file for ensure_vim -- name: 'ensure_vim.package_facts' +- name: ensure_vim.package_facts ansible.builtin.package_facts: -- name: 'ensure_vim.service_facts' +- name: ensure_vim.service_facts ansible.builtin.service_facts: -- name: 'ensure_vim.service_reload' +- name: ensure_vim.service_reload when: - ansible_facts["system"] == 'Linux' - ansible_facts["service_mgr"] == 'systemd' - ensure_vim is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_vim.service_restart' +- name: ensure_vim.service_restart when: - ansible_facts["system"] == 'Linux' - ensure_vim is defined @@ -21,9 +21,7 @@ ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' - state: 'restarted' + state: restarted loop: '{{ ensure_vim.service_list }}' loop_control: label: '{{ item.name }} will be restarted' -... - diff --git a/roles/ensure_vim/meta/main.yml b/roles/ensure_vim/meta/main.yml index 227ad9c..9fc0b95 100644 --- a/roles/ensure_vim/meta/main.yml +++ b/roles/ensure_vim/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: your name description: your role description @@ -15,7 +16,6 @@ galaxy_info: # - Apache-2.0 # - CC-BY-4.0 license: license (GPL-2.0-or-later, MIT, etc) - min_ansible_version: 2.9 # If this a Container Enabled role, provide the minimum Ansible Container version. @@ -38,7 +38,6 @@ galaxy_info: # - 1.0 # - 7 # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to @@ -46,8 +45,6 @@ galaxy_info: # # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. - dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. - \ No newline at end of file diff --git a/roles/ensure_vim/tasks/main.yml b/roles/ensure_vim/tasks/main.yml index a54a62c..959b28c 100644 --- a/roles/ensure_vim/tasks/main.yml +++ b/roles/ensure_vim/tasks/main.yml @@ -1,35 +1,37 @@ --- # tasks file for ensure_vim -- name: 'include variables' - when: - - ansible_facts["system"] == 'Linux' +- name: include variables + when: ["ansible_facts[\"system\"] == 'Linux'"] ansible.builtin.include_vars: file: '{{ lookup("first_found", findme) }}' - name: 'ensure_vim' + name: ensure_vim vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] + }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml' - - 'default.yml' - paths: - - '../vars/' - errors: 'ignore' -- name: 'package discovery' + - default.yml + paths: [../vars/] + errors: ignore +- name: package discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: -- name: 'service discovery' +- name: service discovery when: - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: -- name: 'ensure packages' +- name: ensure packages when: - ansible_facts["system"] == 'Linux' - ensure_vim is defined @@ -41,10 +43,8 @@ loop: '{{ ensure_vim.package_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_vim.package_facts' - - 'ensure_vim.service_facts' -- name: 'ensure configurations' + notify: [ensure_vim.package_facts, ensure_vim.service_facts] +- name: ensure configurations when: - ansible_facts["system"] == 'Linux' - ensure_vim is defined @@ -65,11 +65,11 @@ loop_control: label: '{{ item.dest }} will be ensured' notify: - - 'ensure_vim.package_facts' - - 'ensure_vim.service_facts' - - 'ensure_vim.service_reload' - - 'ensure_vim.service_restart' -- name: 'ensure services' + - ensure_vim.package_facts + - ensure_vim.service_facts + - ensure_vim.service_reload + - ensure_vim.service_restart +- name: ensure services when: - ansible_facts["system"] == 'Linux' - ensure_vim is defined @@ -82,10 +82,8 @@ loop: '{{ ensure_vim.service_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_vim.package_facts' - - 'ensure_vim.service_facts' -- name: 'Ensure SELinux is configured' + notify: [ensure_vim.package_facts, ensure_vim.service_facts] +- name: Ensure SELinux is configured when: - ansible_facts["system"] == 'Linux' - ensure_vim is defined @@ -94,13 +92,13 @@ ansible.posix.selinux: policy: '{{ ensure_vim.selinux_policy }}' state: '{{ ensure_vim.selinux_state }}' - register: 'ensure_vim_results' + register: ensure_vim_results notify: - - 'ensure_vim.package_facts' - - 'ensure_vim.service_facts' - - 'ensure_vim.service_reload' - - 'ensure_vim.service_restart' -- name: 'Reboot if required' + - ensure_vim.package_facts + - ensure_vim.service_facts + - ensure_vim.service_reload + - ensure_vim.service_restart +- name: Reboot if required when: - ansible_facts["system"] == 'Linux' - ensure_vim is defined @@ -110,7 +108,7 @@ - ensure_vim_results.reboot_required is defined - ensure_vim_results.reboot_required ansible.builtin.reboot: -- name: 'ensure seboolean' +- name: ensure seboolean when: - ansible_facts["system"] == 'Linux' - ensure_vim is defined @@ -124,10 +122,9 @@ loop_control: label: '{{ item.name }} will be {{ item.state }}' notify: - - 'ensure_vim.package_facts' - - 'ensure_vim.service_facts' - - 'ensure_vim.service_reload' - - 'ensure_vim.service_restart' -- name: 'flush handlers' - ansible.builtin.meta: 'flush_handlers' -... + - ensure_vim.package_facts + - ensure_vim.service_facts + - ensure_vim.service_reload + - ensure_vim.service_restart +- name: flush handlers + ansible.builtin.meta: flush_handlers diff --git a/roles/ensure_vim/tests/test.yml b/roles/ensure_vim/tests/test.yml index b734de0..f8d6db2 100644 --- a/roles/ensure_vim/tests/test.yml +++ b/roles/ensure_vim/tests/test.yml @@ -1,5 +1,4 @@ --- - hosts: localhost remote_user: root - roles: - - ensure_vim \ No newline at end of file + roles: [ensure_vim] diff --git a/roles/ensure_vim/vars/AlmaLinux-10-default.yml b/roles/ensure_vim/vars/AlmaLinux-10-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/AlmaLinux-10-default.yml +++ b/roles/ensure_vim/vars/AlmaLinux-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/AlmaLinux-9-default.yml b/roles/ensure_vim/vars/AlmaLinux-9-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/AlmaLinux-9-default.yml +++ b/roles/ensure_vim/vars/AlmaLinux-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/CentOS-10-default.yml b/roles/ensure_vim/vars/CentOS-10-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/CentOS-10-default.yml +++ b/roles/ensure_vim/vars/CentOS-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/CentOS-9-default.yml b/roles/ensure_vim/vars/CentOS-9-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/CentOS-9-default.yml +++ b/roles/ensure_vim/vars/CentOS-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/Debian-11-default.yml b/roles/ensure_vim/vars/Debian-11-default.yml index 79833f2..627f357 100644 --- a/roles/ensure_vim/vars/Debian-11-default.yml +++ b/roles/ensure_vim/vars/Debian-11-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim' - state: 'present' -... - + - name: vim + state: present diff --git a/roles/ensure_vim/vars/Debian-12-default.yml b/roles/ensure_vim/vars/Debian-12-default.yml index 79833f2..627f357 100644 --- a/roles/ensure_vim/vars/Debian-12-default.yml +++ b/roles/ensure_vim/vars/Debian-12-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim' - state: 'present' -... - + - name: vim + state: present diff --git a/roles/ensure_vim/vars/Debian-13-default.yml b/roles/ensure_vim/vars/Debian-13-default.yml index 79833f2..627f357 100644 --- a/roles/ensure_vim/vars/Debian-13-default.yml +++ b/roles/ensure_vim/vars/Debian-13-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim' - state: 'present' -... - + - name: vim + state: present diff --git a/roles/ensure_vim/vars/Fedora-42-default.yml b/roles/ensure_vim/vars/Fedora-42-default.yml index 72bd0ad..937acd7 100644 --- a/roles/ensure_vim/vars/Fedora-42-default.yml +++ b/roles/ensure_vim/vars/Fedora-42-default.yml @@ -1,11 +1,9 @@ --- # vars file for ensure_vim package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' - - name: 'vim-enhanced' - state: 'present' -... - + - name: nano-default-editor + state: absent + - name: vim-default-editor + state: present + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/Fedora-43-default.yml b/roles/ensure_vim/vars/Fedora-43-default.yml index 72bd0ad..937acd7 100644 --- a/roles/ensure_vim/vars/Fedora-43-default.yml +++ b/roles/ensure_vim/vars/Fedora-43-default.yml @@ -1,11 +1,9 @@ --- # vars file for ensure_vim package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' - - name: 'vim-enhanced' - state: 'present' -... - + - name: nano-default-editor + state: absent + - name: vim-default-editor + state: present + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/Fedora-44-default.yml b/roles/ensure_vim/vars/Fedora-44-default.yml index 72bd0ad..937acd7 100644 --- a/roles/ensure_vim/vars/Fedora-44-default.yml +++ b/roles/ensure_vim/vars/Fedora-44-default.yml @@ -1,11 +1,9 @@ --- # vars file for ensure_vim package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' - - name: 'vim-enhanced' - state: 'present' -... - + - name: nano-default-editor + state: absent + - name: vim-default-editor + state: present + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/OracleLinux-10-default.yml b/roles/ensure_vim/vars/OracleLinux-10-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/OracleLinux-10-default.yml +++ b/roles/ensure_vim/vars/OracleLinux-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/OracleLinux-9-default.yml b/roles/ensure_vim/vars/OracleLinux-9-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/OracleLinux-9-default.yml +++ b/roles/ensure_vim/vars/OracleLinux-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/Rocky-10-default.yml b/roles/ensure_vim/vars/Rocky-10-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/Rocky-10-default.yml +++ b/roles/ensure_vim/vars/Rocky-10-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/Rocky-9-default.yml b/roles/ensure_vim/vars/Rocky-9-default.yml index eb55ddf..04fee17 100644 --- a/roles/ensure_vim/vars/Rocky-9-default.yml +++ b/roles/ensure_vim/vars/Rocky-9-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim-enhanced' - state: 'present' -... - + - name: vim-enhanced + state: present diff --git a/roles/ensure_vim/vars/Ubuntu-22-default.yml b/roles/ensure_vim/vars/Ubuntu-22-default.yml index 79833f2..627f357 100644 --- a/roles/ensure_vim/vars/Ubuntu-22-default.yml +++ b/roles/ensure_vim/vars/Ubuntu-22-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim' - state: 'present' -... - + - name: vim + state: present diff --git a/roles/ensure_vim/vars/Ubuntu-24-default.yml b/roles/ensure_vim/vars/Ubuntu-24-default.yml index 79833f2..627f357 100644 --- a/roles/ensure_vim/vars/Ubuntu-24-default.yml +++ b/roles/ensure_vim/vars/Ubuntu-24-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim' - state: 'present' -... - + - name: vim + state: present diff --git a/roles/ensure_vim/vars/Ubuntu-26-default.yml b/roles/ensure_vim/vars/Ubuntu-26-default.yml index 79833f2..627f357 100644 --- a/roles/ensure_vim/vars/Ubuntu-26-default.yml +++ b/roles/ensure_vim/vars/Ubuntu-26-default.yml @@ -1,7 +1,5 @@ --- # vars file for ensure_vim package_list: - - name: 'vim' - state: 'present' -... - + - name: vim + state: present diff --git a/roles/ensure_vim/vars/default.yml b/roles/ensure_vim/vars/default.yml index 8659d21..91da2a7 100644 --- a/roles/ensure_vim/vars/default.yml +++ b/roles/ensure_vim/vars/default.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_vim \ No newline at end of file +... diff --git a/roles/ensure_vim/vars/main.yml b/roles/ensure_vim/vars/main.yml index 8659d21..91da2a7 100644 --- a/roles/ensure_vim/vars/main.yml +++ b/roles/ensure_vim/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_vim \ No newline at end of file +... diff --git a/roles/requirements.yml b/roles/requirements.yml index bef0855..d78069f 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -1,3 +1,2 @@ --- roles: -... diff --git a/test.yml b/test.yml index 1f04d49..7f6179b 100644 --- a/test.yml +++ b/test.yml @@ -1,51 +1,50 @@ --- -- name: 'all' - hosts: 'all' - gather_facts: 'yes' +- name: all + hosts: all + gather_facts: true roles: - - role: 'ensure_ansible_prereq' - - role: 'ensure_hostname' - - role: 'ensure_os_patch' - - role: 'ensure_os_upgrade' - - role: 'ensure_cockpit' - - role: 'ensure_git' - - role: 'ensure_log_rotation' - - role: 'ensure_repo_epel' - - role: 'ensure_repo_rpmfusion' - - role: 'ensure_rsync' - - role: 'ensure_selinux' - - role: 'ensure_sudo' - - role: 'ensure_timezone' - - role: 'ensure_vim' -- name: 'http' - hosts: 'http' - gather_facts: 'yes' + - role: ensure_ansible_prereq + - role: ensure_hostname + - role: ensure_os_patch + - role: ensure_os_upgrade + - role: ensure_cockpit + - role: ensure_fail2ban + - role: ensure_git + - role: ensure_log_rotation + - role: ensure_repo_epel + - role: ensure_repo_rpmfusion + - role: ensure_rsync + - role: ensure_selinux + - role: ensure_sudo + - role: ensure_timezone + - role: ensure_vim +- name: http + hosts: http + gather_facts: true roles: - - role: 'ensure_apache' -- name: 'mariadb' - hosts: 'mariadb' - gather_facts: 'yes' + - role: ensure_apache +- name: mariadb + hosts: mariadb + gather_facts: true roles: - - role: 'ensure_mariadb' -- name: 'smtp' - hosts: 'smtp' - gather_facts: 'yes' + - role: ensure_mariadb +- name: smtp + hosts: smtp + gather_facts: true roles: - - role: 'ensure_postfix' -- name: 'imap' - hosts: 'imap' - gather_facts: 'yes' + - role: ensure_postfix +- name: imap + hosts: imap + gather_facts: true roles: - - role: 'ensure_dovecot' -- name: 'podman' - hosts: 'podman' - gather_facts: 'yes' + - role: ensure_dovecot +- name: podman + hosts: podman + gather_facts: true roles: - - role: 'ensure_podman' -- name: 'gitea' - hosts: 'gitea' - gather_facts: 'yes' + - role: ensure_podman +- name: gitea + hosts: gitea + gather_facts: true roles: - - role: 'ensure_gitea' -... - + - role: ensure_gitea