From b94198294bb4935ef3c32580359361a0fd999384 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 22 Nov 2022 11:00:11 +0100 Subject: [PATCH] Update to 2022-11-22 11:00 --- roles/consul/defaults/main.yml | 4 ++-- roles/kimai/defaults/main.yml | 4 ++-- roles/linstor_gateway/defaults/main.yml | 4 ++-- roles/linstor_gateway/tasks/install.yml | 1 + roles/repo_samba4/defaults/main.yml | 2 +- roles/repo_zabbix/tasks/Debian.yml | 6 ++++++ roles/repo_zabbix/tasks/RedHat.yml | 13 +++++++++++++ 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml index 135b268..3dc7393 100644 --- a/roles/consul/defaults/main.yml +++ b/roles/consul/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of consul to deploy -consul_version: 1.14.0 +consul_version: 1.14.1 # URL from where the consul archive will be downloaded consul_archive_url: https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip # Expected sha256 of the archive -consul_archive_sha256: 6907e0dc83a05acaa9de60217e44ce55bd05c98152dcef02f9258bd2a474f2b3 +consul_archive_sha256: e544964cf4df3fc18f58bb875bdbad4c7a6ff746ab7f7f6b0d7a0d469893490d # user account under which consul will run (will be created if needed) consul_user: consul diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml index 220b063..63707cd 100644 --- a/roles/kimai/defaults/main.yml +++ b/roles/kimai/defaults/main.yml @@ -5,12 +5,12 @@ # You can set it to a number or a simple string (no special chars) kimai_id: 1 # Kimai version to deploy -kimai_version: '1.28.1' +kimai_version: '1.29.0' # URL of the archive kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz # Expected sha256 of the archive -kimai_archive_sha256: 90e05658222368c15e8596438a19090948db71c18dca6f2b02fe2f32dfc01e75 +kimai_archive_sha256: 6dafad49c2a60108a160f8fd70935dbc410a46e447823e6195bf39d3544074c2 # Directory where kimai will be installed kimai_root_dir: /opt/kimai_{{ kimai_id }} diff --git a/roles/linstor_gateway/defaults/main.yml b/roles/linstor_gateway/defaults/main.yml index aa2c87f..d76260b 100644 --- a/roles/linstor_gateway/defaults/main.yml +++ b/roles/linstor_gateway/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of linstor-gateway to install -lingw_version: 0.13.1 +lingw_version: 1.0.0 # URL where linstor-gateway will be downloaded lingw_bin_url: https://github.com/LINBIT/linstor-gateway/releases/download/v{{ lingw_version }}/linstor-gateway-linux-amd64 # Expected sha256 of the binary -lingw_bin_sha256: 83d4d13154caeee79a0bec01db4a571cc417301fc001eb0ee9a6210279201934 +lingw_bin_sha256: 1667cc53e6bb9d44d19f32e727d06b87bf3b977f162028c0b04aa9336a4eacc4 # List of Linstor controllers lingw_controllers: ['http://localhost:3370'] diff --git a/roles/linstor_gateway/tasks/install.yml b/roles/linstor_gateway/tasks/install.yml index 3e556db..be55c8a 100644 --- a/roles/linstor_gateway/tasks/install.yml +++ b/roles/linstor_gateway/tasks/install.yml @@ -10,6 +10,7 @@ dest: /usr/local/bin/linstor-gateway checksum: sha256:{{ lingw_bin_sha256 }} mode: 755 + notify: restart linstor-gateway when: lingw_install_mode != 'none' tags: drbd diff --git a/roles/repo_samba4/defaults/main.yml b/roles/repo_samba4/defaults/main.yml index f47e670..aa14743 100644 --- a/roles/repo_samba4/defaults/main.yml +++ b/roles/repo_samba4/defaults/main.yml @@ -1,3 +1,3 @@ --- # Select a branch from https://samba.tranquil.it/centos7/ or https://samba.tranquil.it/centos7/ -samba_major_version: samba-{{ (ansible_distribution_major_version is version('8','<')) | ternary('4.12.15','4.17.1') }} +samba_major_version: samba-{{ (ansible_distribution_major_version is version('8','<')) | ternary('4.12.15','4.17.2') }} diff --git a/roles/repo_zabbix/tasks/Debian.yml b/roles/repo_zabbix/tasks/Debian.yml index 7257025..6222448 100644 --- a/roles/repo_zabbix/tasks/Debian.yml +++ b/roles/repo_zabbix/tasks/Debian.yml @@ -12,3 +12,9 @@ repo: deb http://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main filename: zabbix tags: repo,zabbix + +- name: Add Zabbix Agent2 plugins repo + apt_repository: + repo: deb http://repo.zabbix.com/zabbix-agent2-plugins/1/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main + filename: zabbix + tags: repo,zabbix diff --git a/roles/repo_zabbix/tasks/RedHat.yml b/roles/repo_zabbix/tasks/RedHat.yml index cfa58df..9a6492f 100644 --- a/roles/repo_zabbix/tasks/RedHat.yml +++ b/roles/repo_zabbix/tasks/RedHat.yml @@ -48,6 +48,18 @@ - zabbix* tags: repo,zabbix +- name: Configure Zabbix Agent2 plugins repo + yum_repository: + name: zabbix-agent2-plugins + description: Zabbix Agent2 plugins Repository + baseurl: http://repo.zabbix.com/zabbix-agent2-plugins/1/rhel/$releasever/$basearch/ + gpgcheck: True + gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-zabbix + priority: 50 + includepkgs: + - zabbix* + tags: repo,zabbix + - name: Configure Zabbix frontend repo yum_repository: name: zabbix-frontend @@ -61,3 +73,4 @@ - zabbix* state: "{{ (zabbix_major_version is version('5.0', '>=') and zabbix_major_version is version('5.4', '<') and ansible_distribution_major_version is version('8', '<')) | ternary('present', 'absent') }}" tags: repo,zabbix +