Update to 2020-11-07 23:00

master
Daniel Berteaud 4 years ago
parent 2e0dafba5a
commit 314f6212cd
  1. 2
      roles/common/defaults/main.yml
  2. 6
      roles/jitsi/tasks/install.yml
  3. 2
      roles/matrix_synapse/templates/pre-backup.sh.j2
  4. 2
      roles/psono/tasks/archive_pre.yml
  5. 6
      roles/repo_base/tasks/base_CentOS7.yml
  6. 5
      roles/repo_base/tasks/base_CentOS8.yml
  7. 9
      roles/repo_base/tasks/epel_CentOS8.yml
  8. 6
      roles/repo_base/tasks/main.yml
  9. 2
      roles/repo_zabbix/tasks/RedHat.yml
  10. 2
      roles/zabbix_agent/tasks/install_RedHat.yml

@ -43,7 +43,7 @@ system_utils_el:
- lz4 - lz4
- yum-utils - yum-utils
- fuse-sshfs - fuse-sshfs
- policycoreutils-python - "{{ ansible_distribution_major_version is version('8', '<') | ternary('policycoreutils-python','python3-policycoreutils') }}"
# List specific for Debian based # List specific for Debian based
system_utils_deb: system_utils_deb:

@ -13,7 +13,7 @@
# If you use an Let's Encrypt cert, it might not be there yet. In this case, create a link # 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 # 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 - name: Link cert to the default one
file: path={{ jitsi_cert_path }} src=/etc/prosody/certs/localhost.crt state=link file: path={{ jitsi_cert_path }} src=/etc/prosody/certs/localhost.crt state=link
when: not jitsi_cert_file.stat.exists when: not jitsi_cert_file.stat.exists
@ -24,7 +24,7 @@
when: not jitsi_key_file.stat.exists when: not jitsi_key_file.stat.exists
tags: jitsi 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 }} - name: Configure maven for {{ jitsi_user }}
template: src=maven.xml.j2 dest={{ jitsi_root_dir }}/.m2/settings.xml template: src=maven.xml.j2 dest={{ jitsi_root_dir }}/.m2/settings.xml
tags: jitsi tags: jitsi
@ -145,7 +145,7 @@
shell: | shell: |
rm -rf {{ jitsi_root_dir }}/meet/* rm -rf {{ jitsi_root_dir }}/meet/*
mkdir -p {{ jitsi_root_dir }}/meet/css 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/ cp css/all.css {{ jitsi_root_dir }}/meet/css/
args: args:
chdir: "{{ jitsi_root_dir }}/src/meet" chdir: "{{ jitsi_root_dir }}/src/meet"

@ -1,6 +1,6 @@
#!/bin/bash -e #!/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 \ --clean \
--create \ --create \
--username={{ synapse_pg_db_user }} \ --username={{ synapse_pg_db_user }} \

@ -26,7 +26,7 @@
- name: Archive database - name: Archive database
command: > command: >
/usr/pgsql-12/bin/pg_dump /usr/pgsql-13/bin/pg_dump
--clean --clean
--host={{ psono_db_server }} --host={{ psono_db_server }}
--port={{ psono_db_port }} --port={{ psono_db_port }}

@ -25,3 +25,9 @@
gpgcheck: True gpgcheck: True
gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
enabled: False enabled: False
- name: Install yum priorities plugin
yum:
name:
- yum-plugin-priorities
tags: repo

@ -11,13 +11,12 @@
loop: loop:
- repo: BaseOS - repo: BaseOS
- repo: AppStream - repo: AppStream
- repo: Extras - repo: PowerTools
- repo: extras
- repo: cr - repo: cr
enabled: False enabled: False
- repo: centosplus - repo: centosplus
enabled: False enabled: False
- repo: PowerTools
enabled: False
- repo: fasttrack - repo: fasttrack
enabled: False enabled: False
tags: repo tags: repo

@ -9,3 +9,12 @@
gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-8 gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-8
exclude: dehydrated exclude: dehydrated
tags: repo 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

@ -6,12 +6,6 @@
- include_tasks: epel_{{ ansible_distribution }}{{ ansible_distribution_major_version }}.yml - include_tasks: epel_{{ ansible_distribution }}{{ ansible_distribution_major_version }}.yml
tags: repo tags: repo
- name: Install yum priorities plugin
yum:
name:
- yum-plugin-priorities
tags: repo
- name: Configure FWS repository - name: Configure FWS repository
yum_repository: yum_repository:
name: fws name: fws

@ -59,5 +59,5 @@
priority: 50 priority: 50
includepkgs: includepkgs:
- zabbix* - 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 tags: repo

@ -15,7 +15,7 @@
- zabbix-agent - zabbix-agent
- zabbix-agent-addons - zabbix-agent-addons
- openssl - openssl
- policycoreutils-python - "{{ ansible_distribution_major_version is version('8', '<') | ternary('policycoreutils-python','python3-policycoreutils') }}"
state: "{{ zabbix_agent_update | ternary('latest','present') }}" state: "{{ zabbix_agent_update | ternary('latest','present') }}"
notify: restart zabbix-agent notify: restart zabbix-agent
tags: zabbix tags: zabbix

Loading…
Cancel
Save