From 5956dad4fdfae41114d70187fee8a5108ec4cad8 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 20 Sep 2023 10:00:24 +0200 Subject: [PATCH] Update to 2023-09-20 10:00 --- roles/consul/templates/post-backup.j2 | 2 +- roles/consul/templates/pre-backup.j2 | 2 +- roles/consul_bin/defaults/main.yml | 4 ++-- roles/documize/defaults/main.yml | 4 ++-- roles/kimai/defaults/main.yml | 4 ++-- roles/matrix_element/defaults/main.yml | 4 ++-- roles/matrix_synapse/defaults/main.yml | 2 +- roles/metabase/defaults/main.yml | 6 +++--- roles/miniflux/defaults/main.yml | 4 ++-- roles/nginx/tasks/facts.yml | 10 ++++++++++ roles/nginx/tasks/install.yml | 5 ++--- roles/nginx/tasks/main.yml | 4 ++-- roles/nginx/vars/RedHat-7.yml | 4 ++++ roles/nginx/vars/RedHat-8.yml | 4 ++++ roles/nginx/vars/RedHat-9.yml | 4 ++++ roles/repo_samba4/vars/RedHat-8.yml | 2 +- roles/repo_samba4/vars/RedHat-9.yml | 2 +- 17 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 roles/nginx/vars/RedHat-7.yml create mode 100644 roles/nginx/vars/RedHat-8.yml create mode 100644 roles/nginx/vars/RedHat-9.yml diff --git a/roles/consul/templates/post-backup.j2 b/roles/consul/templates/post-backup.j2 index ceeb438..c3076d4 100644 --- a/roles/consul/templates/post-backup.j2 +++ b/roles/consul/templates/post-backup.j2 @@ -1,4 +1,4 @@ #!/bin/sh set -eo pipefail -rm -f {{ consul_root_dir }}/backup/consul.snap +rm -f {{ consul_root_dir }}/backup/consul*.snap diff --git a/roles/consul/templates/pre-backup.j2 b/roles/consul/templates/pre-backup.j2 index dd9a506..748d4f3 100644 --- a/roles/consul/templates/pre-backup.j2 +++ b/roles/consul/templates/pre-backup.j2 @@ -12,4 +12,4 @@ fi export CONSUL_HTTP_TOKEN={{ consul_backup_token }} {% endif %} {% endif %} -consul snapshot save {{ consul_root_dir }}/backup/consul.snap +consul snapshot save -append-filename version,dc,node,status {{ consul_root_dir }}/backup/consul.snap diff --git a/roles/consul_bin/defaults/main.yml b/roles/consul_bin/defaults/main.yml index d545a36..e00dfd8 100644 --- a/roles/consul_bin/defaults/main.yml +++ b/roles/consul_bin/defaults/main.yml @@ -1,8 +1,8 @@ --- # Version of consul to deploy -consul_version: 1.16.1 +consul_version: 1.16.2 # 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: 1d48942fa9f1d0df3f56a1622c7a46e9b85924ed9976338912101bb5519aadf1 +consul_archive_sha256: 2c87fffbb8abb3ba776519514db659f174a7c5b65faad7818457049ca9ff338b diff --git a/roles/documize/defaults/main.yml b/roles/documize/defaults/main.yml index 0ff9c36..0ea2eff 100644 --- a/roles/documize/defaults/main.yml +++ b/roles/documize/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of cocumize to deploy -documize_version: 5.9.0 +documize_version: 5.10.0 # URL of the binary to install documize_bin_url: https://github.com/documize/community/releases/download/v{{ documize_version }}/documize-community-linux-amd64 # Expected sha1 of the binary -documize_bin_sha256: 800a08917a2f14c15ac07eb3db7b71af8f33fd7a7bcf7df780b235c53d38268e +documize_bin_sha256: f89dee7661d4e7a181fcba82e3734a4c0ae703ea043b7552728980e01032b8e8 # Should ansible handle upgrades or only initial install ? documize_manage_upgrade: True diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml index e36f3c7..0b1f22b 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: '2.0.33' +kimai_version: '2.0.34' # 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: 9cad2555eb115711e100ca129c8152f3ec19ebfde6334a1ec5b7b2009b011959 +kimai_archive_sha256: ec0faef8512ea1659b86361ccbbe4c4afa32225e07d664b765a42775bad0006d # Directory where kimai will be installed kimai_root_dir: /opt/kimai_{{ kimai_id }} diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml index 7e85728..c7e5adb 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.41 -element_archive_sha256: b03e59e4c3da71278f1b79df2469cdc25c250129c7669a0531888a0e1ae41529 +element_version: 1.11.43 +element_archive_sha256: e5b8d48498ceedced1dd19116a61e8e1809e173ea14a43a0f1e40353873969a3 # 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 46c38e4..59d7385 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.92.1' +synapse_version: '1.92.3' # Should ansible handle Synapse upgrades ? If false, only initial install will be done synapse_manage_upgrade: True diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml index f227eca..5ce8cc6 100644 --- a/roles/metabase/defaults/main.yml +++ b/roles/metabase/defaults/main.yml @@ -1,15 +1,15 @@ --- # Version to deploy -metabase_version: 0.47.1 +metabase_version: 0.47.2 # URL to fetch the jar metabase_jar_url: https://downloads.metabase.com/v{{ metabase_version }}/metabase.jar # Expected sha256 of the jar -metabase_jar_sha256: d86199ca8cac909198b16bffdf62e448bd17dc234e62c7540f66e654304b8327 +metabase_jar_sha256: 94f7335561881f6da4f4cea54683e477e9da91eeade99f97bce020281a23076c # When building from source metabase_archive_url: https://github.com/metabase/metabase/archive/refs/tags/v{{ metabase_version }}.tar.gz # Expected sha256 of the archive -metabase_archive_sha256: b058cda14369207bc13f0c47d39746fe354043033d068f0a57f96ff559c574fb +metabase_archive_sha256: 5add9fb25674c820bf0c9dc16929fa42cf7ae2affb5b55e3988a1bacb21673c1 # Should ansible handle upgrades ? If set to false, only the initial install (and the config) will be handled metabase_manage_upgrade: True diff --git a/roles/miniflux/defaults/main.yml b/roles/miniflux/defaults/main.yml index 40d79c5..2dda0f3 100644 --- a/roles/miniflux/defaults/main.yml +++ b/roles/miniflux/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to install -miniflux_version: 2.0.47 +miniflux_version: 2.0.48 # URL of the binary to install miniflux_bin_url: https://github.com/miniflux/v2/releases/download/{{ miniflux_version }}/miniflux-linux-amd64 # Expected sha256 of the binary -miniflux_bin_sha256: d4e87d77ecddd4dfd8889292805a955b48d35c0a431dfa26190a09ace558a0d0 +miniflux_bin_sha256: c9bd207ac53046961f114d8cecb9fdf6af98b0aa1f828ba045463f58807edc1f # Should ansible handle upgrades ? If false, only initial install will be done miniflux_manage_upgrade: True diff --git a/roles/nginx/tasks/facts.yml b/roles/nginx/tasks/facts.yml index ca365c5..acd7724 100644 --- a/roles/nginx/tasks/facts.yml +++ b/roles/nginx/tasks/facts.yml @@ -1,4 +1,14 @@ --- + +# Load distribution specific variables +- include_vars: "{{ item }}" + with_first_found: + - "{{ role_path }}/vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" + - "{{ role_path }}/vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml" + - "{{ role_path }}/vars/{{ ansible_distribution }}.yml" + - "{{ role_path }}/vars/{{ ansible_os_family }}.yml" + tags: web + - name: List http ports set_fact: nginx_ports={{ nginx_ports + (nginx_vhosts | selectattr('port','defined') | map(attribute='port') | list) | flatten | unique }} tags: firewall,web,quickweb diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 39374f2..902e804 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -2,9 +2,8 @@ - name: Install python-passlib package: - name: - - python-passlib - tags: nginx + name: "{{ nginx_tools_packages }}" + tags: web - include_tasks: install_openresty.yml when: nginx_openresty diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index c7079cb..1eb2d99 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -1,8 +1,8 @@ --- -- include_tasks: install.yml +- include_tasks: facts.yml tags: always -- include_tasks: facts.yml +- include_tasks: install.yml tags: always - include_tasks: ssl.yml diff --git a/roles/nginx/vars/RedHat-7.yml b/roles/nginx/vars/RedHat-7.yml new file mode 100644 index 0000000..387c0e5 --- /dev/null +++ b/roles/nginx/vars/RedHat-7.yml @@ -0,0 +1,4 @@ +--- + +nginx_tools_packages: + - python-passlib diff --git a/roles/nginx/vars/RedHat-8.yml b/roles/nginx/vars/RedHat-8.yml new file mode 100644 index 0000000..3bb5dfa --- /dev/null +++ b/roles/nginx/vars/RedHat-8.yml @@ -0,0 +1,4 @@ +--- + +nginx_tools_packages: + - python3-passlib diff --git a/roles/nginx/vars/RedHat-9.yml b/roles/nginx/vars/RedHat-9.yml new file mode 100644 index 0000000..387c0e5 --- /dev/null +++ b/roles/nginx/vars/RedHat-9.yml @@ -0,0 +1,4 @@ +--- + +nginx_tools_packages: + - python-passlib diff --git a/roles/repo_samba4/vars/RedHat-8.yml b/roles/repo_samba4/vars/RedHat-8.yml index 73dd0c9..5d057eb 100644 --- a/roles/repo_samba4/vars/RedHat-8.yml +++ b/roles/repo_samba4/vars/RedHat-8.yml @@ -1,3 +1,3 @@ --- -samba_major_version: 4.18 +samba_major_version: 4.19 diff --git a/roles/repo_samba4/vars/RedHat-9.yml b/roles/repo_samba4/vars/RedHat-9.yml index 73dd0c9..5d057eb 100644 --- a/roles/repo_samba4/vars/RedHat-9.yml +++ b/roles/repo_samba4/vars/RedHat-9.yml @@ -1,3 +1,3 @@ --- -samba_major_version: 4.18 +samba_major_version: 4.19