From 9d86a90d5280cd9bdc2c7f780e67cb61c401a6a4 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 22 Jul 2021 19:00:06 +0200 Subject: [PATCH] Update to 2021-07-22 19:00 --- roles/common/tasks/main.yml | 1 + roles/common/vars/RedHat-7.yml | 13 +++ roles/common/vars/RedHat-8.yml | 13 +++ roles/crowdsec_firewall_bouncer/tasks/facts.yml | 1 + roles/freepbx/tasks/main.yml | 1 + roles/freepbx/vars/RedHat-7.yml | 32 ++++++ roles/freepbx/vars/RedHat-8.yml | 31 ++++++ roles/funkwhale/tasks/facts.yml | 1 + roles/funkwhale/vars/RedHat-7.yml | 17 +++ roles/funkwhale/vars/RedHat-8.yml | 16 +++ roles/gitea/tasks/facts.yml | 1 + roles/gitea/vars/RedHat-7.yml | 6 ++ roles/gitea/vars/RedHat-8.yml | 6 ++ roles/httpd_common/tasks/main.yml | 1 + roles/httpd_common/vars/RedHat-7.yml | 8 ++ roles/httpd_common/vars/RedHat-8.yml | 8 ++ roles/includes/vars/RedHat-7.yml | 5 + roles/includes/vars/RedHat-8.yml | 6 ++ roles/includes/webapps_create_mysql_db.yml | 1 + roles/lemonldap_ng/tasks/main.yml | 1 + roles/lemonldap_ng/vars/RedHat-7.yml | 26 +++++ roles/lemonldap_ng/vars/RedHat-8.yml | 26 +++++ roles/letsencrypt/tasks/main.yml | 1 + roles/letsencrypt/vars/RedHat-7.yml | 5 + roles/letsencrypt/vars/RedHat-8.yml | 5 + roles/matrix_synapse/tasks/facts.yml | 1 + roles/matrix_synapse/vars/RedHat-7.yml | 29 ++++++ roles/matrix_synapse/vars/RedHat-8.yml | 28 +++++ roles/mongodb_server/tasks/facts.yml | 1 + roles/mongodb_server/vars/RedHat-7.yml | 6 ++ roles/mongodb_server/vars/RedHat-8.yml | 6 ++ roles/mysql_server/tasks/main.yml | 1 + roles/mysql_server/vars/RedHat-7.yml | 6 ++ roles/mysql_server/vars/RedHat-8.yml | 6 ++ roles/ntp_client/tasks/main.yml | 1 + roles/ntp_client/vars/RedHat-7.yml | 6 ++ roles/ntp_client/vars/RedHat-8.yml | 6 ++ roles/openxpki/tasks/facts.yml | 1 + roles/openxpki/vars/RedHat-7.yml | 19 ++++ roles/openxpki/vars/RedHat-8.yml | 20 ++++ roles/pgadmin4/tasks/facts.yml | 1 + roles/pgadmin4/vars/RedHat-7.yml | 11 ++ roles/pgadmin4/vars/RedHat-8.yml | 10 ++ roles/phpmyadmin/tasks/main.yml | 1 + roles/phpmyadmin/vars/RedHat-7.yml | 7 ++ roles/phpmyadmin/vars/RedHat-8.yml | 6 ++ roles/postgresql_server/tasks/main.yml | 1 + roles/postgresql_server/vars/RedHat-7.yml | 7 ++ roles/postgresql_server/vars/RedHat-8.yml | 7 ++ roles/repo_base/tasks/AlmaLinux-8.yml | 29 ++++++ roles/repo_base/tasks/CentOS-7.yml | 51 +++++++++ roles/repo_base/tasks/CentOS-8.yml | 125 +++++++++++++++++++++++ roles/repo_base/tasks/epel_RedHat-7.yml | 11 ++ roles/repo_base/tasks/epel_RedHat-8.yml | 20 ++++ roles/repo_base/tasks/fws_RedHat.yml | 22 ++++ roles/repo_base/tasks/main.yml | 47 ++------- roles/repo_base/tasks/postgres_client_RedHat.yml | 5 + roles/repo_remi/tasks/main.yml | 1 + roles/repo_remi/vars/RedHat-7.yml | 3 + roles/repo_remi/vars/RedHat-8.yml | 3 + roles/rsync_server/tasks/main.yml | 1 + roles/rsync_server/vars/RedHat-7.yml | 5 + roles/rsync_server/vars/RedHat-8.yml | 6 ++ roles/samba/tasks/facts.yml | 1 + roles/samba/vars/RedHat-7.yml | 16 +++ roles/samba/vars/RedHat-8.yml | 16 +++ roles/seafile/tasks/facts.yml | 1 + roles/seafile/vars/RedHat-7.yml | 41 ++++++++ roles/seafile/vars/RedHat-8.yml | 43 ++++++++ roles/squid/defaults/main.yml | 1 + roles/squid/files/acl/software_almalinux.domains | 10 ++ roles/ttrss/tasks/main.yml | 1 + roles/ttrss/vars/RedHat-7.yml | 6 ++ roles/ttrss/vars/RedHat-8.yml | 6 ++ roles/unifi/tasks/main.yml | 1 + roles/unifi/vars/RedHat-7.yml | 6 ++ roles/unifi/vars/RedHat-8.yml | 6 ++ roles/wapt_server/tasks/main.yml | 1 + roles/wapt_server/vars/RedHat-7.yml | 7 ++ roles/wapt_server/vars/RedHat-8.yml | 7 ++ roles/zabbix_agent/tasks/facts.yml | 1 + roles/zabbix_agent/vars/RedHat-7.yml | 7 ++ roles/zabbix_agent/vars/RedHat-8.yml | 8 ++ 83 files changed, 896 insertions(+), 39 deletions(-) create mode 100644 roles/common/vars/RedHat-7.yml create mode 100644 roles/common/vars/RedHat-8.yml create mode 100644 roles/freepbx/vars/RedHat-7.yml create mode 100644 roles/freepbx/vars/RedHat-8.yml create mode 100644 roles/funkwhale/vars/RedHat-7.yml create mode 100644 roles/funkwhale/vars/RedHat-8.yml create mode 100644 roles/gitea/vars/RedHat-7.yml create mode 100644 roles/gitea/vars/RedHat-8.yml create mode 100644 roles/httpd_common/vars/RedHat-7.yml create mode 100644 roles/httpd_common/vars/RedHat-8.yml create mode 100644 roles/includes/vars/RedHat-7.yml create mode 100644 roles/includes/vars/RedHat-8.yml create mode 100644 roles/lemonldap_ng/vars/RedHat-7.yml create mode 100644 roles/lemonldap_ng/vars/RedHat-8.yml create mode 100644 roles/letsencrypt/vars/RedHat-7.yml create mode 100644 roles/letsencrypt/vars/RedHat-8.yml create mode 100644 roles/matrix_synapse/vars/RedHat-7.yml create mode 100644 roles/matrix_synapse/vars/RedHat-8.yml create mode 100644 roles/mongodb_server/vars/RedHat-7.yml create mode 100644 roles/mongodb_server/vars/RedHat-8.yml create mode 100644 roles/mysql_server/vars/RedHat-7.yml create mode 100644 roles/mysql_server/vars/RedHat-8.yml create mode 100644 roles/ntp_client/vars/RedHat-7.yml create mode 100644 roles/ntp_client/vars/RedHat-8.yml create mode 100644 roles/openxpki/vars/RedHat-7.yml create mode 100644 roles/openxpki/vars/RedHat-8.yml create mode 100644 roles/pgadmin4/vars/RedHat-7.yml create mode 100644 roles/pgadmin4/vars/RedHat-8.yml create mode 100644 roles/phpmyadmin/vars/RedHat-7.yml create mode 100644 roles/phpmyadmin/vars/RedHat-8.yml create mode 100644 roles/postgresql_server/vars/RedHat-7.yml create mode 100644 roles/postgresql_server/vars/RedHat-8.yml create mode 100644 roles/repo_base/tasks/AlmaLinux-8.yml create mode 100644 roles/repo_base/tasks/CentOS-7.yml create mode 100644 roles/repo_base/tasks/CentOS-8.yml create mode 100644 roles/repo_base/tasks/epel_RedHat-7.yml create mode 100644 roles/repo_base/tasks/epel_RedHat-8.yml create mode 100644 roles/repo_base/tasks/fws_RedHat.yml create mode 100644 roles/repo_base/tasks/postgres_client_RedHat.yml create mode 100644 roles/repo_remi/vars/RedHat-7.yml create mode 100644 roles/repo_remi/vars/RedHat-8.yml create mode 100644 roles/rsync_server/vars/RedHat-7.yml create mode 100644 roles/rsync_server/vars/RedHat-8.yml create mode 100644 roles/samba/vars/RedHat-7.yml create mode 100644 roles/samba/vars/RedHat-8.yml create mode 100644 roles/seafile/vars/RedHat-7.yml create mode 100644 roles/seafile/vars/RedHat-8.yml create mode 100644 roles/squid/files/acl/software_almalinux.domains create mode 100644 roles/ttrss/vars/RedHat-7.yml create mode 100644 roles/ttrss/vars/RedHat-8.yml create mode 100644 roles/unifi/vars/RedHat-7.yml create mode 100644 roles/unifi/vars/RedHat-8.yml create mode 100644 roles/wapt_server/vars/RedHat-7.yml create mode 100644 roles/wapt_server/vars/RedHat-8.yml create mode 100644 roles/zabbix_agent/vars/RedHat-7.yml create mode 100644 roles/zabbix_agent/vars/RedHat-8.yml diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 299ee26..7257859 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml diff --git a/roles/common/vars/RedHat-7.yml b/roles/common/vars/RedHat-7.yml new file mode 100644 index 0000000..99b3376 --- /dev/null +++ b/roles/common/vars/RedHat-7.yml @@ -0,0 +1,13 @@ +--- + +system_distro_utils: + - openssh-clients + - nc + - xz + - lz4 + - yum-utils + - fuse-sshfs + - policycoreutils-python + - MySQL-python + - python-psycopg2 + - zstd diff --git a/roles/common/vars/RedHat-8.yml b/roles/common/vars/RedHat-8.yml new file mode 100644 index 0000000..b3bb35e --- /dev/null +++ b/roles/common/vars/RedHat-8.yml @@ -0,0 +1,13 @@ +--- + +system_distro_utils: + - openssh-clients + - nc + - xz + - lz4 + - yum-utils + - fuse-sshfs + - policycoreutils-python-utils + - python3-mysql + - python3-psycopg2 + - zstd diff --git a/roles/crowdsec_firewall_bouncer/tasks/facts.yml b/roles/crowdsec_firewall_bouncer/tasks/facts.yml index d9e19c0..f963a0b 100644 --- a/roles/crowdsec_firewall_bouncer/tasks/facts.yml +++ b/roles/crowdsec_firewall_bouncer/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: cs diff --git a/roles/freepbx/tasks/main.yml b/roles/freepbx/tasks/main.yml index 40d91eb..e1cedde 100644 --- a/roles/freepbx/tasks/main.yml +++ b/roles/freepbx/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml - vars/defaults.yml diff --git a/roles/freepbx/vars/RedHat-7.yml b/roles/freepbx/vars/RedHat-7.yml new file mode 100644 index 0000000..280d0ed --- /dev/null +++ b/roles/freepbx/vars/RedHat-7.yml @@ -0,0 +1,32 @@ +--- + +fpbx_packages: + - asterisk + - asterisk-voicemail + - asterisk-pjsip + - asterisk-sip + - asterisk-mysql + - asterisk-ael + - asterisk-iax2 + - asterisk-dahdi + - asterisk-fax + - asterisk-ldap + - asterisk-misdn + - asterisk-mp3 + - asterisk-odbc + - mysql-connector-odbc + - mpg123 + - lame + - opus + - nmap + - nodejs + - tar + - mariadb + - MySQL-python + - acl + - gcc-c++ # needed for ucp + - icu + - libicu-devel + - patch + - vsftpd + diff --git a/roles/freepbx/vars/RedHat-8.yml b/roles/freepbx/vars/RedHat-8.yml new file mode 100644 index 0000000..2420c72 --- /dev/null +++ b/roles/freepbx/vars/RedHat-8.yml @@ -0,0 +1,31 @@ +--- + +fpbx_packages: + - asterisk + - asterisk-voicemail + - asterisk-pjsip + - asterisk-sip + - asterisk-mysql + - asterisk-ael + - asterisk-iax2 + - asterisk-dahdi + - asterisk-fax + - asterisk-ldap + - asterisk-mp3 + - asterisk-odbc + - mariadb-connector-odbc + - mpg123 +# - lame + - opus + - nmap + - nodejs + - tar + - mariadb + - python3-mysql + - acl + - gcc-c++ # needed for ucp + - icu + - libicu-devel + - patch + - vsftpd + diff --git a/roles/funkwhale/tasks/facts.yml b/roles/funkwhale/tasks/facts.yml index d55290e..2622d80 100644 --- a/roles/funkwhale/tasks/facts.yml +++ b/roles/funkwhale/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: funkwhale diff --git a/roles/funkwhale/vars/RedHat-7.yml b/roles/funkwhale/vars/RedHat-7.yml new file mode 100644 index 0000000..c46b46b --- /dev/null +++ b/roles/funkwhale/vars/RedHat-7.yml @@ -0,0 +1,17 @@ +--- + +funkwhale_packages: + - gcc + - git + - postgresql13 + - postgresql-devel + - openldap-devel + - cyrus-sasl-devel + - libjpeg-turbo-devel + - python-psycopg2 + - python-setuptools + - python3-virtualenv + - python3-pip + - ffmpeg + - mod_xsendfile + diff --git a/roles/funkwhale/vars/RedHat-8.yml b/roles/funkwhale/vars/RedHat-8.yml new file mode 100644 index 0000000..8320024 --- /dev/null +++ b/roles/funkwhale/vars/RedHat-8.yml @@ -0,0 +1,16 @@ +--- + +funkwhale_packages: + - gcc + - git + - postgresql13 + - postgresql-devel + - openldap-devel + - cyrus-sasl-devel + - libjpeg-turbo-devel + - python3-psycopg2 + - python3-setuptools + - python3-virtualenv + - python3-pip + - ffmpeg + - mod_xsendfile diff --git a/roles/gitea/tasks/facts.yml b/roles/gitea/tasks/facts.yml index 8042865..4ab0d7c 100644 --- a/roles/gitea/tasks/facts.yml +++ b/roles/gitea/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: gitea diff --git a/roles/gitea/vars/RedHat-7.yml b/roles/gitea/vars/RedHat-7.yml new file mode 100644 index 0000000..5c8b2dc --- /dev/null +++ b/roles/gitea/vars/RedHat-7.yml @@ -0,0 +1,6 @@ +--- + +gitea_packages: + - sclo-git212-git + - git-lfs +gitea_scl_cmd: '/bin/scl enable sclo-git212 -- ' diff --git a/roles/gitea/vars/RedHat-8.yml b/roles/gitea/vars/RedHat-8.yml new file mode 100644 index 0000000..02daaaa --- /dev/null +++ b/roles/gitea/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +gitea_packages: + - git + - git-lfs +gitea_scl_cmd: '' diff --git a/roles/httpd_common/tasks/main.yml b/roles/httpd_common/tasks/main.yml index b6255fb..ddb0455 100644 --- a/roles/httpd_common/tasks/main.yml +++ b/roles/httpd_common/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml - vars/defaults.yml diff --git a/roles/httpd_common/vars/RedHat-7.yml b/roles/httpd_common/vars/RedHat-7.yml new file mode 100644 index 0000000..0ca26e4 --- /dev/null +++ b/roles/httpd_common/vars/RedHat-7.yml @@ -0,0 +1,8 @@ +--- + +httpd_common_packages: + - httpd + - mod_fcgid + - policycoreutils-python + - python-passlib + - mod_authnz_pam diff --git a/roles/httpd_common/vars/RedHat-8.yml b/roles/httpd_common/vars/RedHat-8.yml new file mode 100644 index 0000000..f3bf5c1 --- /dev/null +++ b/roles/httpd_common/vars/RedHat-8.yml @@ -0,0 +1,8 @@ +--- + +httpd_common_packages: + - httpd + - mod_fcgid + - python3-policycoreutils + - python3-passlib + - mod_authnz_pam diff --git a/roles/includes/vars/RedHat-7.yml b/roles/includes/vars/RedHat-7.yml new file mode 100644 index 0000000..d5da2e0 --- /dev/null +++ b/roles/includes/vars/RedHat-7.yml @@ -0,0 +1,5 @@ +--- + +webapps_mysql_packages: + - MySQL-python + - mariadb diff --git a/roles/includes/vars/RedHat-8.yml b/roles/includes/vars/RedHat-8.yml new file mode 100644 index 0000000..5407189 --- /dev/null +++ b/roles/includes/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +webapps_mysql_packages: + - python3-mysql + - mariadb + diff --git a/roles/includes/webapps_create_mysql_db.yml b/roles/includes/webapps_create_mysql_db.yml index 3dd98f4..9d1b453 100644 --- a/roles/includes/webapps_create_mysql_db.yml +++ b/roles/includes/webapps_create_mysql_db.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - ../includes/vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - ../includes/vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - ../includes/vars/{{ ansible_distribution }}.yml - ../includes/vars/{{ ansible_os_family }}.yml - ../includes/vars/defaults.yml diff --git a/roles/lemonldap_ng/tasks/main.yml b/roles/lemonldap_ng/tasks/main.yml index 3230376..423f9a7 100644 --- a/roles/lemonldap_ng/tasks/main.yml +++ b/roles/lemonldap_ng/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: web diff --git a/roles/lemonldap_ng/vars/RedHat-7.yml b/roles/lemonldap_ng/vars/RedHat-7.yml new file mode 100644 index 0000000..33652ff --- /dev/null +++ b/roles/lemonldap_ng/vars/RedHat-7.yml @@ -0,0 +1,26 @@ +--- + +llng_common_packages: + - lemonldap-ng-conf + - perl-Cache-Cache + - lemonldap-ng-fastcgi-server + +llng_portal_packages: + - python-passlib + - lemonldap-ng-portal + - lemonldap-ng-doc + - lasso + - lasso-perl + - perl-Authen-Captcha + - perl-Auth-Yubikey_WebClient + +llng_manager_packages: + - lemonldap-ng-manager + - lemonldap-ng-doc + - lemonldap-ng-fr-doc + +llng_mysql_packages: + - perl-DBD-MySQL + - MySQL-python + - mariadb + - perl-Apache-Session-Browseable diff --git a/roles/lemonldap_ng/vars/RedHat-8.yml b/roles/lemonldap_ng/vars/RedHat-8.yml new file mode 100644 index 0000000..1101f8d --- /dev/null +++ b/roles/lemonldap_ng/vars/RedHat-8.yml @@ -0,0 +1,26 @@ +--- + +llng_common_packages: + - lemonldap-ng-conf + - perl-Cache-Cache + - lemonldap-ng-fastcgi-server + - python3-mysql + +llng_portal_packages: + - python3-passlib + - lemonldap-ng-portal + - lemonldap-ng-doc + - lasso + - lasso-perl + - perl-Authen-Captcha + - perl-Auth-Yubikey_WebClient + +llng_manager_packages: + - lemonldap-ng-manager + - lemonldap-ng-doc + +llng_mysql_packages: + - perl-DBD-MySQL + - python3-mysql + - mariadb + - perl-Apache-Session-Browseable diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml index 877f198..03452c2 100644 --- a/roles/letsencrypt/tasks/main.yml +++ b/roles/letsencrypt/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: web,ssl diff --git a/roles/letsencrypt/vars/RedHat-7.yml b/roles/letsencrypt/vars/RedHat-7.yml new file mode 100644 index 0000000..972a5a6 --- /dev/null +++ b/roles/letsencrypt/vars/RedHat-7.yml @@ -0,0 +1,5 @@ +--- + +letsencrypt_packages: + - dehydrated + - python2-dns-lexicon diff --git a/roles/letsencrypt/vars/RedHat-8.yml b/roles/letsencrypt/vars/RedHat-8.yml new file mode 100644 index 0000000..287de66 --- /dev/null +++ b/roles/letsencrypt/vars/RedHat-8.yml @@ -0,0 +1,5 @@ +--- + +letsencrypt_packages: + - dehydrated + - python3-dns-lexicon diff --git a/roles/matrix_synapse/tasks/facts.yml b/roles/matrix_synapse/tasks/facts.yml index 0530e8c..2139c4c 100644 --- a/roles/matrix_synapse/tasks/facts.yml +++ b/roles/matrix_synapse/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: matrix diff --git a/roles/matrix_synapse/vars/RedHat-7.yml b/roles/matrix_synapse/vars/RedHat-7.yml new file mode 100644 index 0000000..ddcd7d5 --- /dev/null +++ b/roles/matrix_synapse/vars/RedHat-7.yml @@ -0,0 +1,29 @@ +--- + +synapse_packages: + - libtiff-devel + - libjpeg-devel + - libzip-devel + - freetype-devel + - lcms2-devel + - libwebp-devel + - tcl-devel + - tk-devel + - libffi-devel + - openssl-devel + - libxslt-devel + - gcc + - gcc-c++ + - libtool + - autoconf + - automake + - postgresql13 + - postgresql-devel + - libpqxx-devel + - jemalloc + - python3-virtualenv + - python3-pip + - python-psycopg2 + - python-setuptools + +synapse_jemalloc: /usr/lib64/libjemalloc.so.1 diff --git a/roles/matrix_synapse/vars/RedHat-8.yml b/roles/matrix_synapse/vars/RedHat-8.yml new file mode 100644 index 0000000..ec0c599 --- /dev/null +++ b/roles/matrix_synapse/vars/RedHat-8.yml @@ -0,0 +1,28 @@ +--- + +synapse_packages: + - libtiff-devel + - libjpeg-devel + - libzip-devel + - freetype-devel + - lcms2-devel + - libwebp-devel + - tcl-devel + - tk-devel + - libffi-devel + - openssl-devel + - libxslt-devel + - gcc + - gcc-c++ + - libtool + - autoconf + - automake + - postgresql13 + - postgresql-devel + - jemalloc + - python3-virtualenv + - python3-pip + - python3-psycopg2 + - python3-setuptools + +synapse_jemalloc: /usr/lib64/libjemalloc.so.2 diff --git a/roles/mongodb_server/tasks/facts.yml b/roles/mongodb_server/tasks/facts.yml index eb7578b..107bd8d 100644 --- a/roles/mongodb_server/tasks/facts.yml +++ b/roles/mongodb_server/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: mongo diff --git a/roles/mongodb_server/vars/RedHat-7.yml b/roles/mongodb_server/vars/RedHat-7.yml new file mode 100644 index 0000000..365ec1c --- /dev/null +++ b/roles/mongodb_server/vars/RedHat-7.yml @@ -0,0 +1,6 @@ +--- + +mongo_packages: + - mongodb-org-server + - mongodb-org + - python-pip diff --git a/roles/mongodb_server/vars/RedHat-8.yml b/roles/mongodb_server/vars/RedHat-8.yml new file mode 100644 index 0000000..3e9cac6 --- /dev/null +++ b/roles/mongodb_server/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +mongo_packages: + - mongodb-org-server + - mongodb-org + - python3-pip diff --git a/roles/mysql_server/tasks/main.yml b/roles/mysql_server/tasks/main.yml index 45bb257..0fd6859 100644 --- a/roles/mysql_server/tasks/main.yml +++ b/roles/mysql_server/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml - vars/defaults.yml diff --git a/roles/mysql_server/vars/RedHat-7.yml b/roles/mysql_server/vars/RedHat-7.yml new file mode 100644 index 0000000..afd4daf --- /dev/null +++ b/roles/mysql_server/vars/RedHat-7.yml @@ -0,0 +1,6 @@ +--- + +mysql_server_packages: + - mariadb-server + - mariadb + - MySQL-python diff --git a/roles/mysql_server/vars/RedHat-8.yml b/roles/mysql_server/vars/RedHat-8.yml new file mode 100644 index 0000000..cd5756c --- /dev/null +++ b/roles/mysql_server/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +mysql_server_packages: + - mariadb-server + - mariadb + - python3-mysql diff --git a/roles/ntp_client/tasks/main.yml b/roles/ntp_client/tasks/main.yml index f42498d..8143ce1 100644 --- a/roles/ntp_client/tasks/main.yml +++ b/roles/ntp_client/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: ntp diff --git a/roles/ntp_client/vars/RedHat-7.yml b/roles/ntp_client/vars/RedHat-7.yml new file mode 100644 index 0000000..cf8b402 --- /dev/null +++ b/roles/ntp_client/vars/RedHat-7.yml @@ -0,0 +1,6 @@ +--- + +ntp_ntpd_service: ntpd +ntp_chrony_service: chronyd +ntp_chrony_conf: /etc/chrony.conf +ntp_chrony_keyfile: /etc/chrony.keys diff --git a/roles/ntp_client/vars/RedHat-8.yml b/roles/ntp_client/vars/RedHat-8.yml new file mode 100644 index 0000000..cf8b402 --- /dev/null +++ b/roles/ntp_client/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +ntp_ntpd_service: ntpd +ntp_chrony_service: chronyd +ntp_chrony_conf: /etc/chrony.conf +ntp_chrony_keyfile: /etc/chrony.keys diff --git a/roles/openxpki/tasks/facts.yml b/roles/openxpki/tasks/facts.yml index d8e1b65..6db9a34 100644 --- a/roles/openxpki/tasks/facts.yml +++ b/roles/openxpki/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: pki diff --git a/roles/openxpki/vars/RedHat-7.yml b/roles/openxpki/vars/RedHat-7.yml new file mode 100644 index 0000000..eb58238 --- /dev/null +++ b/roles/openxpki/vars/RedHat-7.yml @@ -0,0 +1,19 @@ +--- + +pki_packages: + - openssl-devel + - openldap-devel + - libxml2-devel + - expat-devel + - mariadb-devel + - libapreq2-devel + - gcc + - perl-App-cpanminus + - gettext # To build I18N files + - pwgen # To generate random secrets + - java-1.8.0-openjdk-headless # For keytool utility + - mariadb # To load the schema + - patch # To apply local patches + - perl-autodie # Provides perl(Fatal), needed to install perl deps + - perl-Config-Std # needed to install perl deps + diff --git a/roles/openxpki/vars/RedHat-8.yml b/roles/openxpki/vars/RedHat-8.yml new file mode 100644 index 0000000..433f73c --- /dev/null +++ b/roles/openxpki/vars/RedHat-8.yml @@ -0,0 +1,20 @@ +--- + +pki_packages: + - openssl-devel + - openldap-devel + - libxml2-devel + - expat-devel + - mariadb-devel + - libapreq2-devel + - gcc + - perl-App-cpanminus + - gettext # To build I18N files + - pwgen # To generate random secrets + - java-1.8.0-openjdk-headless # For keytool utility + - mariadb # To load the schema + - patch # To apply local patches + - perl-autodie # Provides perl(Fatal), needed to install perl deps + - perl-Config-Std # needed to install perl deps + - glibc-langpack-en + diff --git a/roles/pgadmin4/tasks/facts.yml b/roles/pgadmin4/tasks/facts.yml index 8e59b5a..1ac3c3a 100644 --- a/roles/pgadmin4/tasks/facts.yml +++ b/roles/pgadmin4/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: pgadmin4 diff --git a/roles/pgadmin4/vars/RedHat-7.yml b/roles/pgadmin4/vars/RedHat-7.yml new file mode 100644 index 0000000..b9fa21d --- /dev/null +++ b/roles/pgadmin4/vars/RedHat-7.yml @@ -0,0 +1,11 @@ +--- + +pgadmin4_packages: + - gcc + - postgresql + - postgresql-devel + - python3-virtualenv + - python3-pip + - python-setuptools # Needed for pip install expect + - python-pip # Also needed to install expect + - krb5-devel diff --git a/roles/pgadmin4/vars/RedHat-8.yml b/roles/pgadmin4/vars/RedHat-8.yml new file mode 100644 index 0000000..2485ddf --- /dev/null +++ b/roles/pgadmin4/vars/RedHat-8.yml @@ -0,0 +1,10 @@ +--- + +pgadmin4_packages: + - gcc + - postgresql + - postgresql-devel + - python3-virtualenv + - python3-pip + - python3-setuptools # Needed for pip install expect + - krb5-devel diff --git a/roles/phpmyadmin/tasks/main.yml b/roles/phpmyadmin/tasks/main.yml index 17ae428..e220fef 100644 --- a/roles/phpmyadmin/tasks/main.yml +++ b/roles/phpmyadmin/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: pma diff --git a/roles/phpmyadmin/vars/RedHat-7.yml b/roles/phpmyadmin/vars/RedHat-7.yml new file mode 100644 index 0000000..f11ff63 --- /dev/null +++ b/roles/phpmyadmin/vars/RedHat-7.yml @@ -0,0 +1,7 @@ +--- + +pma_packages: + - unzip + - MySQL-python + - mariadb + - acl diff --git a/roles/phpmyadmin/vars/RedHat-8.yml b/roles/phpmyadmin/vars/RedHat-8.yml new file mode 100644 index 0000000..946bee3 --- /dev/null +++ b/roles/phpmyadmin/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +pma_packages: + - unzip + - mariadb + - acl diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml index f105398..a13cdb3 100644 --- a/roles/postgresql_server/tasks/main.yml +++ b/roles/postgresql_server/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml - vars/defaults.yml diff --git a/roles/postgresql_server/vars/RedHat-7.yml b/roles/postgresql_server/vars/RedHat-7.yml new file mode 100644 index 0000000..93d5979 --- /dev/null +++ b/roles/postgresql_server/vars/RedHat-7.yml @@ -0,0 +1,7 @@ +--- + +pg_packages: + - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }} + - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }}-server + - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }}-contrib + - python-psycopg2 diff --git a/roles/postgresql_server/vars/RedHat-8.yml b/roles/postgresql_server/vars/RedHat-8.yml new file mode 100644 index 0000000..3fde919 --- /dev/null +++ b/roles/postgresql_server/vars/RedHat-8.yml @@ -0,0 +1,7 @@ +--- + +pg_packages: + - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }} + - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }}-server + - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }}-contrib + - python3-psycopg2 diff --git a/roles/repo_base/tasks/AlmaLinux-8.yml b/roles/repo_base/tasks/AlmaLinux-8.yml new file mode 100644 index 0000000..530f28e --- /dev/null +++ b/roles/repo_base/tasks/AlmaLinux-8.yml @@ -0,0 +1,29 @@ +--- + +- name: Configure repositories + yum_repository: + file: "{{ item.file }}" + description: "CentOS {{ item.name }}" + name: "{{ item.name }}" + baseurl: https://repo.almalinux.org/almalinux/$releasever/{{ item.dir }}/$basearch/os/ + gpgcheck: True + gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux + enabled: "{{ item.enabled | default(True) }}" + loop: + - name: baseos + file: almalinux + dir: BaseOS + - name: appstream + file: almalinux + dir: AppStream + - name: extras + file: almalinux + dir: extras + - name: powertools + file: almalinux-powertools + dir: PowerTools + tags: repo + +- include: epel_{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml +- include: fws_{{ ansible_os_family }}.yml +- include: postgres_client_{{ ansible_os_family }}.yml diff --git a/roles/repo_base/tasks/CentOS-7.yml b/roles/repo_base/tasks/CentOS-7.yml new file mode 100644 index 0000000..9871c70 --- /dev/null +++ b/roles/repo_base/tasks/CentOS-7.yml @@ -0,0 +1,51 @@ +--- + +- name: Configure base repositories + yum_repository: + file: CentOS-Base + description: "Centos - {{ item.repo }}" + name: "{{ item.repo }}" + baseurl: http://mirror.centos.org/centos/$releasever/{{ item.dir }}/$basearch/ + gpgcheck: True + gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 + exclude: 'lasso*' + loop: + - repo: base + dir: os + - repo: updates + dir: updates + - repo: extras + dir: extras + tags: repo + +- name: Configure centosplus + yum_repository: + file: CentOS-Base + description: "Centos - centosplus" + name: centosplus + baseurl: http://mirror.centos.org/centos/$releasever/centosplus/$basearch/ + gpgcheck: True + gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 + enabled: False + tags: repo + +- name: Install yum priorities plugin + yum: + name: + - yum-plugin-priorities + tags: repo + +- name: Remove obsolete repo + file: path=/etc/yum.repos.d/{{ item }}.repo state=absent + loop: + - nux-dextop + - seadrive + - remi-safe + - redis + - fws-extra-nginx + - CentOS-Linux-BaseOS + tags: repo + +- include: epel_{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml +- include: fws_{{ ansible_os_family }}.yml +- include: postgres_client_{{ ansible_os_family }}.yml diff --git a/roles/repo_base/tasks/CentOS-8.yml b/roles/repo_base/tasks/CentOS-8.yml new file mode 100644 index 0000000..6077313 --- /dev/null +++ b/roles/repo_base/tasks/CentOS-8.yml @@ -0,0 +1,125 @@ +--- + +- when: not repo_centos_stream + block: + - name: Configure repositories + yum_repository: + file: "{{ item.file }}" + description: "CentOS {{ item.name }}" + name: "{{ item.name }}" + baseurl: http://mirror.centos.org/$contentdir/$releasever/{{ item.dir }}/$basearch/os/ + gpgcheck: True + gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + enabled: "{{ item.enabled | default(True) }}" + loop: + - name: baseos + file: CentOS-Linux-Base + dir: BaseOS + - name: appstream + file: CentOS-Linux-AppStream + dir: AppStream + - name: plus + file: CentOS-Linux-Plus + dir: centosplus + enabled: False + - name: extras + file: CentOS-Linux-Extras + dir: extras + - name: powertools + file: CentOS-Linux-PowerTools + dir: PowerTools + + - name: Remove Base file + file: path=/etc/yum.repos.d/{{ item }}.repo state=absent + loop: + - CentOS-Stream-AppStream + - CentOS-Stream-Base + - CentOS-Stream-ContinuousRelease + - CentOS-Stream-Debuginfo + - CentOS-Stream-Devel + - CentOS-Stream-Extras + - CentOS-Stream-FastTrack + - CentOS-Stream-centosplus + - CentOS-Stream-PowerTools + + # Waiting for the allowerasing args to dnf module, landing in ansible 2.10 + - name: Switch to centos-linux-repos + shell: rpm -q centos-linux-repos || dnf install centos-linux-repos -y --allowerasing + args: + warn: False + changed_when: False + + tags: repo + +- when: repo_centos_stream + block: + - name: Check if stream variable is set + copy: content={{ item.content }} dest={{ item.dest }} + loop: + - content: "{{ ansible_distribution_major_version }}-stream" + dest: /etc/dnf/vars/stream + + - name: Configure repositories + yum_repository: + file: "{{ item.file }}" + description: "CentOS {{ item.name }}" + name: "{{ item.name }}" + baseurl: http://mirror.centos.org/$contentdir/$stream/{{ item.dir }}/$basearch/os/ + gpgcheck: True + gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + loop: + - name: baseos + file: CentOS-Stream-BaseOS + dir: BaseOS + - name: appstream + file: CentOS-Stream-AppStream + dir: AppStream + - name: extras + file: CentOS-Stream-Extras + dir: extras + - name: powertools + file: CentOS-Stream-PowerTools + dir: PowerTools + + - name: Remove Base file + file: path=/etc/yum.repos.d/{{ item }}.repo state=absent + loop: + - CentOS-Linux-AppStream + - CentOS-Linux-BaseOS + - CentOS-Linux-Base + - CentOS-Linux-ContinuousRelease + - CentOS-Linux-Debuginfo + - CentOS-Linux-Devel + - CentOS-Linux-Extras + - CentOS-Linux-FastTrack + - CentOS-Linux-centosplus + - CentOS-Linux-Plus + - CentOS-Linux-PowerTools + + # Waiting for the allowerasing args to dnf module, landing in ansible 2.10 + - name: Switch to centos-stream-repos + shell: rpm -q centos-stream-repos || dnf install centos-stream-repos -y --allowerasing + args: + warn: False + changed_when: False + + tags: repo + +- name: Remove old repo files + file: path=/etc/yum.repos.d/{{ item }}.repo state=absent + loop: + - CentOS-Base + - CentOS-CR + - CentOS-Extras + - CentOS-BaseOS + - CentOS-AppStream + - CentOS-PowerTools + - CentOS-centosplus + - CentOS-cr + - CentOS-extras + - CentOS-fasttrack + tags: repo + +- include: epel_{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml +- include: fws_{{ ansible_os_family }}.yml +- include: postgres_client_{{ ansible_os_family }}.yml diff --git a/roles/repo_base/tasks/epel_RedHat-7.yml b/roles/repo_base/tasks/epel_RedHat-7.yml new file mode 100644 index 0000000..296e7d2 --- /dev/null +++ b/roles/repo_base/tasks/epel_RedHat-7.yml @@ -0,0 +1,11 @@ +--- + +- name: Configure EPEL repository + yum_repository: + name: epel + description: "Extra Package for Enterprise Linux" + baseurl: http://mirrors.ircam.fr/pub/fedora/epel/$releasever/$basearch http://mir01.syntis.net/epel/$releasever/$basearch + gpgcheck: True + gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-7 + exclude: dehydrated + tags: repo diff --git a/roles/repo_base/tasks/epel_RedHat-8.yml b/roles/repo_base/tasks/epel_RedHat-8.yml new file mode 100644 index 0000000..bfbd5f1 --- /dev/null +++ b/roles/repo_base/tasks/epel_RedHat-8.yml @@ -0,0 +1,20 @@ +--- + +- name: Configure EPEL repository + yum_repository: + name: epel + description: "Extra Package for Enterprise Linux" + baseurl: http://mirrors.ircam.fr/pub/fedora/epel/$releasever/Everything/$basearch http://mir01.syntis.net/epel/$releasever/Everything/$basearch + gpgcheck: True + gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-8 + exclude: dehydrated + tags: repo + +- name: Config EPEL Modular repository + yum_repository: + name: epel-modular + description: "Extra Packages for Enterprise Linux Modular $releasever - $basearch" + baseurl: http://mirrors.ircam.fr/pub/fedora/epel/$releasever/Modular/$basearch http://mir01.syntis.net/epel/$releasever/Modular/$basearch + gpgcheck: True + gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-8 + tags: repo diff --git a/roles/repo_base/tasks/fws_RedHat.yml b/roles/repo_base/tasks/fws_RedHat.yml new file mode 100644 index 0000000..dbf9b24 --- /dev/null +++ b/roles/repo_base/tasks/fws_RedHat.yml @@ -0,0 +1,22 @@ +--- + +- name: Configure FWS repository + yum_repository: + name: fws + description: "Firewall Services" + baseurl: http://repo.firewall-services.com/centos/$releasever/ + gpgcheck: True + gpgkey: http://repo.firewall-services.com/RPM-GPG-KEY + tags: repo + +- name: Configure FWS Testing repository + yum_repository: + name: fws-testing + description: "Firewall Services Testing" + file: fws + baseurl: http://repo.firewall-services.com/centos-testing/$releasever/ + gpgcheck: True + gpgkey: http://repo.firewall-services.com/RPM-GPG-KEY + enabled: False + tags: repo + diff --git a/roles/repo_base/tasks/main.yml b/roles/repo_base/tasks/main.yml index e520a7b..1a6cd3a 100644 --- a/roles/repo_base/tasks/main.yml +++ b/roles/repo_base/tasks/main.yml @@ -1,43 +1,12 @@ --- -- include_tasks: base_{{ ansible_distribution }}{{ ansible_distribution_major_version }}.yml +- include: '{{ repo_item }}' + with_first_found: + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml' + - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml' + - '{{ ansible_distribution }}.yml' + - '{{ ansible_os_family }}.yml' + loop_control: + loop_var: repo_item tags: repo -- include_tasks: epel_{{ ansible_distribution }}{{ ansible_distribution_major_version }}.yml - tags: repo - -- name: Configure FWS repository - yum_repository: - name: fws - description: "Firewall Services" - baseurl: http://repo.firewall-services.com/centos/$releasever/ - gpgcheck: True - gpgkey: http://repo.firewall-services.com/RPM-GPG-KEY - tags: repo - -- name: Configure FWS Testing repository - yum_repository: - name: fws-testing - description: "Firewall Services Testing" - file: fws - baseurl: http://repo.firewall-services.com/centos-testing/$releasever/ - gpgcheck: True - gpgkey: http://repo.firewall-services.com/RPM-GPG-KEY - enabled: False - tags: repo - -- name: Configure latest PostgreSQL repository - template: src=postgresql-client.repo.j2 dest=/etc/yum.repos.d/postgresql-client.repo - tags: repo - -- name: Remove obsolete repo - file: path=/etc/yum.repos.d/{{ item }}.repo state=absent - loop: - - nux-dextop - - seadrive - - remi-safe - - redis - - fws-extra-nginx - - CentOS-Linux-BaseOS - tags: repo -... diff --git a/roles/repo_base/tasks/postgres_client_RedHat.yml b/roles/repo_base/tasks/postgres_client_RedHat.yml new file mode 100644 index 0000000..ebcaf99 --- /dev/null +++ b/roles/repo_base/tasks/postgres_client_RedHat.yml @@ -0,0 +1,5 @@ +--- + +- name: Configure latest PostgreSQL repository + template: src=postgresql-client.repo.j2 dest=/etc/yum.repos.d/postgresql-client.repo + tags: repo diff --git a/roles/repo_remi/tasks/main.yml b/roles/repo_remi/tasks/main.yml index 92a3907..b771155 100644 --- a/roles/repo_remi/tasks/main.yml +++ b/roles/repo_remi/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml - vars/defaults.yml diff --git a/roles/repo_remi/vars/RedHat-7.yml b/roles/repo_remi/vars/RedHat-7.yml new file mode 100644 index 0000000..a0aed9f --- /dev/null +++ b/roles/repo_remi/vars/RedHat-7.yml @@ -0,0 +1,3 @@ +--- + +repo_remi_gpg_url: https://rpms.remirepo.net/RPM-GPG-KEY-remi diff --git a/roles/repo_remi/vars/RedHat-8.yml b/roles/repo_remi/vars/RedHat-8.yml new file mode 100644 index 0000000..9701de8 --- /dev/null +++ b/roles/repo_remi/vars/RedHat-8.yml @@ -0,0 +1,3 @@ +--- + +repo_remi_gpg_url: https://rpms.remirepo.net/RPM-GPG-KEY-remi2018 diff --git a/roles/rsync_server/tasks/main.yml b/roles/rsync_server/tasks/main.yml index d5707e8..011ec98 100644 --- a/roles/rsync_server/tasks/main.yml +++ b/roles/rsync_server/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: rsync diff --git a/roles/rsync_server/vars/RedHat-7.yml b/roles/rsync_server/vars/RedHat-7.yml new file mode 100644 index 0000000..a166ecc --- /dev/null +++ b/roles/rsync_server/vars/RedHat-7.yml @@ -0,0 +1,5 @@ +--- + +rsync_packages: + - rsync + - libsemanage-python diff --git a/roles/rsync_server/vars/RedHat-8.yml b/roles/rsync_server/vars/RedHat-8.yml new file mode 100644 index 0000000..a397531 --- /dev/null +++ b/roles/rsync_server/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +rsync_packages: + - rsync + - rsync-daemon + - python3-libsemanage diff --git a/roles/samba/tasks/facts.yml b/roles/samba/tasks/facts.yml index e2b701a..343c0c3 100644 --- a/roles/samba/tasks/facts.yml +++ b/roles/samba/tasks/facts.yml @@ -18,6 +18,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: samba diff --git a/roles/samba/vars/RedHat-7.yml b/roles/samba/vars/RedHat-7.yml new file mode 100644 index 0000000..644f262 --- /dev/null +++ b/roles/samba/vars/RedHat-7.yml @@ -0,0 +1,16 @@ +--- + +samba_common_packages: + - samba + - samba-client + - sssd-winbind-idmap + - openldap-clients + - policycoreutils-python + - tdb-tools + +samba_dc_packages: + - samba-dc + - ldb-tools + - krb5-workstation + - python36-markdown + - patch diff --git a/roles/samba/vars/RedHat-8.yml b/roles/samba/vars/RedHat-8.yml new file mode 100644 index 0000000..756181b --- /dev/null +++ b/roles/samba/vars/RedHat-8.yml @@ -0,0 +1,16 @@ +--- + +samba_common_packages: + - samba + - samba-client + - sssd-winbind-idmap + - openldap-clients + - policycoreutils-python-utils + - tdb-tools + +samba_dc_packages: + - samba-dc + - ldb-tools + - krb5-workstation + - python3-markdown + - patch diff --git a/roles/seafile/tasks/facts.yml b/roles/seafile/tasks/facts.yml index 934d7e7..4a286bb 100644 --- a/roles/seafile/tasks/facts.yml +++ b/roles/seafile/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: seafile diff --git a/roles/seafile/vars/RedHat-7.yml b/roles/seafile/vars/RedHat-7.yml new file mode 100644 index 0000000..f4e8ab2 --- /dev/null +++ b/roles/seafile/vars/RedHat-7.yml @@ -0,0 +1,41 @@ +--- + +seafile_packages: + - python3 + - python3-setuptools + - python3-pip + - python3-virtualenv + - python3-devel + - gcc + - gcc-c++ + - MySQL-python + - ffmpeg + - ffmpeg-devel + - libmemcached-devel + - mysql-devel + - zlib-devel + - gcc + - tar + - mariadb + - fuse + - java-1.8.0-openjdk # For seafile-pro + - poppler-utils # For seafile-pro + - unoconv # For seafile-pro + - python-setuptools # needed for ansible to create the venv + +seafile_python_libs: + - Pillow + - pylibmc + - captcha + - jinja2 + - sqlalchemy + - psd-tools + - django-pylibmc + - django-simple-captcha + - python3-ldap + - requests_oauthlib + - future + - mysqlclient==2.0.1 + +seafile_rm_libs: + - libnssutil3.so diff --git a/roles/seafile/vars/RedHat-8.yml b/roles/seafile/vars/RedHat-8.yml new file mode 100644 index 0000000..bdc260c --- /dev/null +++ b/roles/seafile/vars/RedHat-8.yml @@ -0,0 +1,43 @@ +--- + +seafile_packages: + - python3 + - python3-setuptools + - python3-pip + - python3-virtualenv + - python3-mysql + - python3-devel + - gcc + - gcc-c++ + - ffmpeg + - ffmpeg-devel + - libmemcached-devel + - mysql-devel + - zlib-devel + - gcc + - tar + - mariadb + - fuse + - java-1.8.0-openjdk # For seafile-pro + - poppler-utils # For seafile-pro + - unoconv # For seafile-pro + - python3-setuptools # needed for ansible to create the venv + +seafile_python_libs: + - Pillow + - pylibmc + - captcha + - jinja2 + - sqlalchemy + - psd-tools + - django-pylibmc + - django-simple-captcha + - python3-ldap + - requests_oauthlib + - future + - mysqlclient + +seafile_rm_libs: + - liblber-2.4.so.2 + - libldap-2.4.so.2 + - libsasl2.so.3 diff --git a/roles/squid/defaults/main.yml b/roles/squid/defaults/main.yml index 16e5c47..cdf9db6 100644 --- a/roles/squid/defaults/main.yml +++ b/roles/squid/defaults/main.yml @@ -95,6 +95,7 @@ squid_base_acl: - '"/etc/squid/acl/service_various.domains"' - '"/etc/squid/acl/software_epel.domains"' - '"/etc/squid/acl/software_centos.domains"' + - '"/etc/squid/acl/software_almalinux.domains"' - '"/etc/squid/acl/software_debian.domains"' - '"/etc/squid/acl/software_various.domains"' - '"/etc/squid/acl/software_smeserver.domains"' diff --git a/roles/squid/files/acl/software_almalinux.domains b/roles/squid/files/acl/software_almalinux.domains new file mode 100644 index 0000000..6cdf119 --- /dev/null +++ b/roles/squid/files/acl/software_almalinux.domains @@ -0,0 +1,10 @@ +mirrors.almalinux.org +repo.almalinux.org +mirror.crexio.com +mirror.almalinux.ikoula.com +almalinux.li +almalinux.mirrors.itworxx.de +almalinux.mirror.liteserver.nl +almalinux.uib.no +almalinux.slaskdatacenter.com +almalinux.mirror.katapult.io diff --git a/roles/ttrss/tasks/main.yml b/roles/ttrss/tasks/main.yml index 2cc3149..6554bd9 100644 --- a/roles/ttrss/tasks/main.yml +++ b/roles/ttrss/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml - vars/defaults.yml diff --git a/roles/ttrss/vars/RedHat-7.yml b/roles/ttrss/vars/RedHat-7.yml new file mode 100644 index 0000000..39536ef --- /dev/null +++ b/roles/ttrss/vars/RedHat-7.yml @@ -0,0 +1,6 @@ +--- + +ttrss_packages: + - git + - MySQL-python + - mariadb diff --git a/roles/ttrss/vars/RedHat-8.yml b/roles/ttrss/vars/RedHat-8.yml new file mode 100644 index 0000000..c84a3a5 --- /dev/null +++ b/roles/ttrss/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +ttrss_packages: + - git + - python3-mysql + - mariadb diff --git a/roles/unifi/tasks/main.yml b/roles/unifi/tasks/main.yml index 88f7149..42717a5 100644 --- a/roles/unifi/tasks/main.yml +++ b/roles/unifi/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: unifi diff --git a/roles/unifi/vars/RedHat-7.yml b/roles/unifi/vars/RedHat-7.yml new file mode 100644 index 0000000..a1771e9 --- /dev/null +++ b/roles/unifi/vars/RedHat-7.yml @@ -0,0 +1,6 @@ +--- + +unifi_packages: + - java-1.8.0-openjdk-headless + - mongodb-org-server + - mongodb-org diff --git a/roles/unifi/vars/RedHat-8.yml b/roles/unifi/vars/RedHat-8.yml new file mode 100644 index 0000000..a1771e9 --- /dev/null +++ b/roles/unifi/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +--- + +unifi_packages: + - java-1.8.0-openjdk-headless + - mongodb-org-server + - mongodb-org diff --git a/roles/wapt_server/tasks/main.yml b/roles/wapt_server/tasks/main.yml index c5d2f71..913e2ee 100644 --- a/roles/wapt_server/tasks/main.yml +++ b/roles/wapt_server/tasks/main.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: wapt diff --git a/roles/wapt_server/vars/RedHat-7.yml b/roles/wapt_server/vars/RedHat-7.yml new file mode 100644 index 0000000..9051edc --- /dev/null +++ b/roles/wapt_server/vars/RedHat-7.yml @@ -0,0 +1,7 @@ +--- + +wapt_packages: + - tis-waptserver + - tis-waptsetup + - postgresql13 + - python-psycopg2 # Needed to manage PG with ansible diff --git a/roles/wapt_server/vars/RedHat-8.yml b/roles/wapt_server/vars/RedHat-8.yml new file mode 100644 index 0000000..11a9ec2 --- /dev/null +++ b/roles/wapt_server/vars/RedHat-8.yml @@ -0,0 +1,7 @@ +--- + +wapt_packages: + - tis-waptserver +# - tis-waptsetup + - postgresql13 + - python3-psycopg2 # Needed to manage PG with ansible diff --git a/roles/zabbix_agent/tasks/facts.yml b/roles/zabbix_agent/tasks/facts.yml index 9938ac1..0ab84e5 100644 --- a/roles/zabbix_agent/tasks/facts.yml +++ b/roles/zabbix_agent/tasks/facts.yml @@ -3,6 +3,7 @@ - include_vars: "{{ item }}" with_first_found: - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml + - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml tags: zabbix diff --git a/roles/zabbix_agent/vars/RedHat-7.yml b/roles/zabbix_agent/vars/RedHat-7.yml new file mode 100644 index 0000000..03b9f60 --- /dev/null +++ b/roles/zabbix_agent/vars/RedHat-7.yml @@ -0,0 +1,7 @@ +--- + +zabbix_agent_packages: + - zabbix-agent + - zabbix-agent-addons + - policycoreutils-python + - openssl diff --git a/roles/zabbix_agent/vars/RedHat-8.yml b/roles/zabbix_agent/vars/RedHat-8.yml new file mode 100644 index 0000000..71726b6 --- /dev/null +++ b/roles/zabbix_agent/vars/RedHat-8.yml @@ -0,0 +1,8 @@ +--- + +zabbix_agent_packages: + - zabbix-agent + - zabbix-agent-addons + - policycoreutils-python-utils + - openssl +