From 314f6212cdda9d2957e2d0067b0d04b86f12907a Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sat, 7 Nov 2020 23:00:07 +0100 Subject: [PATCH] Update to 2020-11-07 23:00 --- roles/common/defaults/main.yml | 2 +- roles/jitsi/tasks/install.yml | 6 +++--- roles/matrix_synapse/templates/pre-backup.sh.j2 | 2 +- roles/psono/tasks/archive_pre.yml | 2 +- roles/repo_base/tasks/base_CentOS7.yml | 6 ++++++ roles/repo_base/tasks/base_CentOS8.yml | 5 ++--- roles/repo_base/tasks/epel_CentOS8.yml | 9 +++++++++ roles/repo_base/tasks/main.yml | 6 ------ roles/repo_zabbix/tasks/RedHat.yml | 2 +- roles/zabbix_agent/tasks/install_RedHat.yml | 2 +- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index 786f7c3..c4b3a9f 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -43,7 +43,7 @@ system_utils_el: - lz4 - yum-utils - fuse-sshfs - - policycoreutils-python + - "{{ ansible_distribution_major_version is version('8', '<') | ternary('policycoreutils-python','python3-policycoreutils') }}" # List specific for Debian based system_utils_deb: diff --git a/roles/jitsi/tasks/install.yml b/roles/jitsi/tasks/install.yml index bfa0b3b..6b12c54 100644 --- a/roles/jitsi/tasks/install.yml +++ b/roles/jitsi/tasks/install.yml @@ -13,7 +13,7 @@ # If you use an Let's Encrypt cert, it might not be there yet. In this case, create a link # to the default prosody cert so the service can be started. The cert will be obtained after that and - # override the links + # will override the links - name: Link cert to the default one file: path={{ jitsi_cert_path }} src=/etc/prosody/certs/localhost.crt state=link when: not jitsi_cert_file.stat.exists @@ -24,7 +24,7 @@ when: not jitsi_key_file.stat.exists tags: jitsi - # Needed if you use a proxy, as maven does not honor the standard $http_proxy / $https_proxy env + # Needed if you use a proxy, as maven does not honor the standard http_proxy / https_proxy env vars - name: Configure maven for {{ jitsi_user }} template: src=maven.xml.j2 dest={{ jitsi_root_dir }}/.m2/settings.xml tags: jitsi @@ -145,7 +145,7 @@ shell: | rm -rf {{ jitsi_root_dir }}/meet/* mkdir -p {{ jitsi_root_dir }}/meet/css - cp -r *.js *.html connection_optimization favicon.ico fonts images libs static sounds LICENSE lang {{ jitsi_root_dir }}/meet/ + cp -r *.js *.html connection_optimization favicon.ico fonts images libs static sounds LICENSE lang *.json {{ jitsi_root_dir }}/meet/ cp css/all.css {{ jitsi_root_dir }}/meet/css/ args: chdir: "{{ jitsi_root_dir }}/src/meet" diff --git a/roles/matrix_synapse/templates/pre-backup.sh.j2 b/roles/matrix_synapse/templates/pre-backup.sh.j2 index 17bbfcb..f3f0673 100644 --- a/roles/matrix_synapse/templates/pre-backup.sh.j2 +++ b/roles/matrix_synapse/templates/pre-backup.sh.j2 @@ -1,6 +1,6 @@ #!/bin/bash -e -PGPASSWORD='{{ synapse_pg_db_pass }}' /usr/pgsql-12/bin/pg_dump \ +PGPASSWORD='{{ synapse_pg_db_pass }}' /usr/pgsql-13/bin/pg_dump \ --clean \ --create \ --username={{ synapse_pg_db_user }} \ diff --git a/roles/psono/tasks/archive_pre.yml b/roles/psono/tasks/archive_pre.yml index fdf9530..709344c 100644 --- a/roles/psono/tasks/archive_pre.yml +++ b/roles/psono/tasks/archive_pre.yml @@ -26,7 +26,7 @@ - name: Archive database command: > - /usr/pgsql-12/bin/pg_dump + /usr/pgsql-13/bin/pg_dump --clean --host={{ psono_db_server }} --port={{ psono_db_port }} diff --git a/roles/repo_base/tasks/base_CentOS7.yml b/roles/repo_base/tasks/base_CentOS7.yml index 933150e..cbcc00f 100644 --- a/roles/repo_base/tasks/base_CentOS7.yml +++ b/roles/repo_base/tasks/base_CentOS7.yml @@ -25,3 +25,9 @@ gpgcheck: True gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 enabled: False + +- name: Install yum priorities plugin + yum: + name: + - yum-plugin-priorities + tags: repo diff --git a/roles/repo_base/tasks/base_CentOS8.yml b/roles/repo_base/tasks/base_CentOS8.yml index aa29cbc..06bc397 100644 --- a/roles/repo_base/tasks/base_CentOS8.yml +++ b/roles/repo_base/tasks/base_CentOS8.yml @@ -11,13 +11,12 @@ loop: - repo: BaseOS - repo: AppStream - - repo: Extras + - repo: PowerTools + - repo: extras - repo: cr enabled: False - repo: centosplus enabled: False - - repo: PowerTools - enabled: False - repo: fasttrack enabled: False tags: repo diff --git a/roles/repo_base/tasks/epel_CentOS8.yml b/roles/repo_base/tasks/epel_CentOS8.yml index 44ac6ed..bfbd5f1 100644 --- a/roles/repo_base/tasks/epel_CentOS8.yml +++ b/roles/repo_base/tasks/epel_CentOS8.yml @@ -9,3 +9,12 @@ 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/main.yml b/roles/repo_base/tasks/main.yml index 16ff1b3..b7a0162 100644 --- a/roles/repo_base/tasks/main.yml +++ b/roles/repo_base/tasks/main.yml @@ -6,12 +6,6 @@ - include_tasks: epel_{{ ansible_distribution }}{{ ansible_distribution_major_version }}.yml tags: repo -- name: Install yum priorities plugin - yum: - name: - - yum-plugin-priorities - tags: repo - - name: Configure FWS repository yum_repository: name: fws diff --git a/roles/repo_zabbix/tasks/RedHat.yml b/roles/repo_zabbix/tasks/RedHat.yml index e56f7c0..9d5a369 100644 --- a/roles/repo_zabbix/tasks/RedHat.yml +++ b/roles/repo_zabbix/tasks/RedHat.yml @@ -59,5 +59,5 @@ priority: 50 includepkgs: - zabbix* - state: "{{ (zabbix_major_version is version('5.0', '>=') and ansible_distribution_major_version is version('8.0', '<')) | ternary('present', 'absent') }}" + state: "{{ (zabbix_major_version is version('5.0', '>=') and ansible_distribution_major_version is version('8', '<')) | ternary('present', 'absent') }}" tags: repo diff --git a/roles/zabbix_agent/tasks/install_RedHat.yml b/roles/zabbix_agent/tasks/install_RedHat.yml index b86aa92..2767b81 100644 --- a/roles/zabbix_agent/tasks/install_RedHat.yml +++ b/roles/zabbix_agent/tasks/install_RedHat.yml @@ -15,7 +15,7 @@ - zabbix-agent - zabbix-agent-addons - openssl - - policycoreutils-python + - "{{ ansible_distribution_major_version is version('8', '<') | ternary('policycoreutils-python','python3-policycoreutils') }}" state: "{{ zabbix_agent_update | ternary('latest','present') }}" notify: restart zabbix-agent tags: zabbix