From 5f94190c9ef4202c96d80e7f3acc9fb382459e2f Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 7 Dec 2022 11:00:11 +0100 Subject: [PATCH] Update to 2022-12-07 11:00 --- roles/matrix_element/defaults/main.yml | 4 ++-- roles/matrix_synapse/defaults/main.yml | 2 +- roles/paperless_ng/defaults/main.yml | 4 ++-- roles/postgresql_server/tasks/main.yml | 8 ++++++++ roles/seafile/defaults/main.yml | 4 ++-- roles/unifi/defaults/main.yml | 4 ++-- roles/unifi/tasks/main.yml | 22 ++++++++++++++++++++++ roles/unifi/vars/RedHat-7.yml | 2 +- roles/unifi/vars/RedHat-8.yml | 2 +- 9 files changed, 41 insertions(+), 11 deletions(-) diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml index fab905b..b5bb492 100644 --- a/roles/matrix_element/defaults/main.yml +++ b/roles/matrix_element/defaults/main.yml @@ -5,8 +5,8 @@ element_id: element # Version to deploy, and expected sha256 -element_version: 1.11.15 -element_archive_sha256: 2d2c73957b6693a75afee72c6262f42c19f073e085591bc213e81b6fc0050617 +element_version: 1.11.16 +element_archive_sha256: 19594e1c51fc35fb18f3e1707ffe9e4309273b7d478e4f96c0222ce1c07c135e # Where to install element element_root_dir: /opt/matrix/element diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml index 02b99b0..048ffaf 100644 --- a/roles/matrix_synapse/defaults/main.yml +++ b/roles/matrix_synapse/defaults/main.yml @@ -1,7 +1,7 @@ --- # Synapse version to deploy -synapse_version: '1.72.0' +synapse_version: '1.73.0' # Should ansible handle Synapse upgrades ? If false, only initial install will be done synapse_manage_upgrade: True diff --git a/roles/paperless_ng/defaults/main.yml b/roles/paperless_ng/defaults/main.yml index 7d77dc7..43e4241 100644 --- a/roles/paperless_ng/defaults/main.yml +++ b/roles/paperless_ng/defaults/main.yml @@ -1,13 +1,13 @@ --- # The version to deploy -paperless_version: 1.10.1 +paperless_version: 1.10.2 # Instance ID, as you can deploy several instances on the same server paperless_id: 1 # URL of the paperless archive paperless_archive_url: https://github.com/paperless-ngx/paperless-ngx/releases/download/v{{ paperless_version }}/paperless-ngx-v{{ paperless_version }}.tar.xz # Expected checksum -paperless_archive_sha256: dde5d831a5749c6c8cabad0c39bfe4f79c17b6ff88df7f94a927ea961ac623d6 +paperless_archive_sha256: b8ead11c736a218b036f329c03b12c6198da7692f2001e0ab3e3d4f8136c4d61 # Should ansible handle install and upgrades, or only initial install paperless_manage_upgrade: True # Root directory where paperless will be installed diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml index 29058f8..b09dac1 100644 --- a/roles/postgresql_server/tasks/main.yml +++ b/roles/postgresql_server/tasks/main.yml @@ -142,6 +142,14 @@ role: "{{ pg_monitoring_user }}" database: postgres + - name: grant pg_monitor role + postgresql_privs: + type: group + state: present + objs: pg_monitor + roles: "{{ pg_monitoring_user }}" + database: postgres + become_user: postgres tags: pg,zabbix diff --git a/roles/seafile/defaults/main.yml b/roles/seafile/defaults/main.yml index 2e2cb2e..5714b4e 100644 --- a/roles/seafile/defaults/main.yml +++ b/roles/seafile/defaults/main.yml @@ -11,11 +11,11 @@ # MaxUsers = "9" # Mode = "subscription" # etc... -seafile_version: "{{ seafile_license is defined | ternary('9.0.13','9.0.9') }}" +seafile_version: "{{ seafile_license is defined | ternary('9.0.13','9.0.10') }}" # Archive URL and sha256 are only used for the community version seafile_archive_url: https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seafile-server_{{ seafile_version }}_x86-64.tar.gz -seafile_archive_sha256: db76bb33572ad0a6860470e907bed4ed780aa17d9e022226d99448a7f9e4ba74 +seafile_archive_sha256: cb2a22482e3383c53d5be0d54845a88727f4c42b9cd0e1381e01d9fadbc20670 seafile_root_dir: /opt/seafile seafile_data_dir: "{{ seafile_root_dir }}/data" diff --git a/roles/unifi/defaults/main.yml b/roles/unifi/defaults/main.yml index 7048a07..b825483 100644 --- a/roles/unifi/defaults/main.yml +++ b/roles/unifi/defaults/main.yml @@ -3,11 +3,11 @@ # Where unifi will be installed unifi_root_dir: /opt/unifi # Version to deploy -unifi_version: 7.2.95 +unifi_version: 7.3.76 # URL to get the installation tarball unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip # Expected sha256 -unifi_archive_sha256: 0ab8439a3f652a3e48d370a099949be002d769a03ab48367442748f138ee5acc +unifi_archive_sha256: e4f62606a6eba055c0ab16735cc3b7002f2e7913cac64fe0a1469c76b26d9067 # Should ansible handle upgrades (if False, only initial install will be done) unifi_manage_upgrade: True # List of ports used by UniFi controler diff --git a/roles/unifi/tasks/main.yml b/roles/unifi/tasks/main.yml index 41c486f..a324aca 100644 --- a/roles/unifi/tasks/main.yml +++ b/roles/unifi/tasks/main.yml @@ -24,6 +24,28 @@ notify: restart unifi tags: unifi +- name: Detect exact JRE version + command: rpm -q java-11-openjdk-headless + args: + warn: False + changed_when: False + register: jitsi_jre11_version + tags: unifi + +- name: Select JRE 11 as default version + alternatives: + name: "{{ item.name }}" + link: "{{ item.link }}" + path: "{{ item.path }}" + loop: + - name: java + link: /usr/bin/java + path: /usr/lib/jvm/{{ jitsi_jre11_version.stdout | trim | regex_replace('-headless', '') }}/bin/java + - name: jre_openjdk + link: /usr/lib/jvm/jre-openjdk + path: /usr/lib/jvm/{{ jitsi_jre11_version.stdout | trim | regex_replace('-headless', '') }} + tags: unifi + - name: Create a system account to run unifi user: name: unifi diff --git a/roles/unifi/vars/RedHat-7.yml b/roles/unifi/vars/RedHat-7.yml index a1771e9..b162f26 100644 --- a/roles/unifi/vars/RedHat-7.yml +++ b/roles/unifi/vars/RedHat-7.yml @@ -1,6 +1,6 @@ --- unifi_packages: - - java-1.8.0-openjdk-headless + - java-11-openjdk-headless - mongodb-org-server - mongodb-org diff --git a/roles/unifi/vars/RedHat-8.yml b/roles/unifi/vars/RedHat-8.yml index a1771e9..b162f26 100644 --- a/roles/unifi/vars/RedHat-8.yml +++ b/roles/unifi/vars/RedHat-8.yml @@ -1,6 +1,6 @@ --- unifi_packages: - - java-1.8.0-openjdk-headless + - java-11-openjdk-headless - mongodb-org-server - mongodb-org