From 72afb8eda57a1dedbc8bb0b435a2b09f8ee50664 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 4 Jan 2024 17:00:34 +0100 Subject: [PATCH] Update to 2024-01-04 17:00 --- roles/consul_template/defaults/main.yml | 4 ++-- roles/documize/tasks/archive_pre.yml | 2 +- roles/documize/tasks/install.yml | 2 +- roles/documize/templates/pre-backup.j2 | 4 ++-- roles/funkwhale/tasks/archive_pre.yml | 2 +- roles/funkwhale/templates/pre-backup.sh.j2 | 2 +- roles/funkwhale/vars/RedHat-7.yml | 2 +- roles/funkwhale/vars/RedHat-8.yml | 2 +- roles/mailman/tasks/archive_pre.yml | 2 +- roles/mailman/templates/pre-backup.sh.j2 | 4 ++-- roles/matrix_synapse/tasks/archive_pre.yml | 2 +- roles/matrix_synapse/templates/pre-backup.sh.j2 | 2 +- roles/matrix_synapse/vars/RedHat-7.yml | 2 +- roles/matrix_synapse/vars/RedHat-8.yml | 2 +- roles/matrix_synapse/vars/RedHat-9.yml | 2 +- roles/metabase/tasks/archive_pre.yml | 2 +- roles/metabase/tasks/install.yml | 2 +- roles/metabase/templates/pre-backup.j2 | 2 +- roles/miniflux/tasks/archive_pre.yml | 4 ++-- roles/miniflux/tasks/install.yml | 2 +- roles/miniflux/templates/pre-backup.j2 | 2 +- roles/n8n/tasks/archive_pre.yml | 2 +- roles/n8n/tasks/install.yml | 2 +- roles/n8n/templates/pre-backup.sh.j2 | 2 +- roles/nomad/tasks/install.yml | 4 ++++ roles/nomad/vars/RedHat.yml | 1 + roles/odoo/tasks/archive_pre.yml | 4 ++-- roles/odoo/templates/pre-backup.sh.j2 | 2 +- roles/odoo/vars/RedHat-8.yml | 2 +- roles/paperless_ng/tasks/archive_pre.yml | 4 ++-- roles/paperless_ng/templates/pre-backup.j2 | 2 +- roles/penpot/tasks/archive_pre.yml | 4 ++-- roles/penpot/templates/pre-backup.j2 | 2 +- roles/pgadmin4/templates/config_local.py.j2 | 2 +- roles/pgadmin4/vars/RedHat-7.yml | 2 +- roles/pgadmin4/vars/RedHat-8.yml | 2 +- roles/repo_base/templates/postgresql-client.repo.j2 | 6 +++--- roles/repo_postgresql/templates/postgresql.repo.j2 | 4 ++-- roles/squash_tm/tasks/archive_pre.yml | 4 ++-- roles/squash_tm/templates/pre-backup.j2 | 4 ++-- roles/squid/files/acl/software_various.domains | 3 +++ roles/taiga/tasks/archive_pre.yml | 4 ++-- roles/taiga/templates/pre-backup.j2 | 2 +- roles/taiga/vars/RedHat-8.yml | 2 +- roles/wapt_server/templates/pre-backup.sh.j2 | 2 +- roles/wapt_server/vars/RedHat-7.yml | 2 +- roles/wapt_server/vars/RedHat-8.yml | 2 +- 47 files changed, 65 insertions(+), 57 deletions(-) diff --git a/roles/consul_template/defaults/main.yml b/roles/consul_template/defaults/main.yml index 4ea21bb..90a7f2f 100644 --- a/roles/consul_template/defaults/main.yml +++ b/roles/consul_template/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of consul-template to install -consul_tpl_version: 0.35.0 +consul_tpl_version: 0.36.0 # URL of the archive consul_tpl_archive_url: https://releases.hashicorp.com/consul-template/{{ consul_tpl_version }}/consul-template_{{ consul_tpl_version }}_linux_amd64.zip # Expected sha256 of the archive -consul_tpl_archive_sha256: 1b1c9127e8da25b2d7322e6f2aa8e6d946336083999e0fdb321f96ffd447eebd +consul_tpl_archive_sha256: 9844aebb997b81dd5b58a6ddadbf650eca4b200ccbc2ad680d817528a73c0d3a # Root dir where consul-template will be installed consul_tpl_root_dir: /opt/consul_template diff --git a/roles/documize/tasks/archive_pre.yml b/roles/documize/tasks/archive_pre.yml index ac40880..ce469c2 100644 --- a/roles/documize/tasks/archive_pre.yml +++ b/roles/documize/tasks/archive_pre.yml @@ -10,7 +10,7 @@ - name: Backup the database (PostgreSQL) command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ documize_db_server }} diff --git a/roles/documize/tasks/install.yml b/roles/documize/tasks/install.yml index 2b8cef9..4d3bc10 100644 --- a/roles/documize/tasks/install.yml +++ b/roles/documize/tasks/install.yml @@ -5,7 +5,7 @@ name: - tar - zstd - - postgresql15 + - postgresql16 tags: documize - name: Download documize diff --git a/roles/documize/templates/pre-backup.j2 b/roles/documize/templates/pre-backup.j2 index 8bf1810..389c4c4 100644 --- a/roles/documize/templates/pre-backup.j2 +++ b/roles/documize/templates/pre-backup.j2 @@ -13,14 +13,14 @@ set -eo pipefail --add-drop-table {{ documize_db_name | quote }} | zstd -c > "{{ documize_root_dir }}/backup/{{ documize_db_name }}.sql.zst" {% elif documize_db_engine == 'postgres' %} {% if documize_db_server not in ['127.0.0.1','localhost'] %} -PGPASSWORD={{ documize_db_pass | quote }} /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD={{ documize_db_pass | quote }} /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ documize_db_user | quote }} \ --host={{ documize_db_server | quote }} \ {{ documize_db_name | quote }} | \ {% else %} -su - postgres -c "/usr/pgsql-15/bin/pg_dump --clean --create {{ documize_db_name | quote }}" | \ +su - postgres -c "/usr/pgsql-16/bin/pg_dump --clean --create {{ documize_db_name | quote }}" | \ {% endif %} zstd -c > "{{ documize_root_dir }}/backup/{{ documize_db_name }}.sql.zst" {% endif %} diff --git a/roles/funkwhale/tasks/archive_pre.yml b/roles/funkwhale/tasks/archive_pre.yml index d1424ce..9714316 100644 --- a/roles/funkwhale/tasks/archive_pre.yml +++ b/roles/funkwhale/tasks/archive_pre.yml @@ -19,7 +19,7 @@ - name: Archive a database dump command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ funkwhale_db_server }} diff --git a/roles/funkwhale/templates/pre-backup.sh.j2 b/roles/funkwhale/templates/pre-backup.sh.j2 index e641468..a7913a4 100644 --- a/roles/funkwhale/templates/pre-backup.sh.j2 +++ b/roles/funkwhale/templates/pre-backup.sh.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD={{ funkwhale_db_pass | quote }} /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD={{ funkwhale_db_pass | quote }} /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ funkwhale_db_user | quote }} \ diff --git a/roles/funkwhale/vars/RedHat-7.yml b/roles/funkwhale/vars/RedHat-7.yml index e492d5b..1a0e9af 100644 --- a/roles/funkwhale/vars/RedHat-7.yml +++ b/roles/funkwhale/vars/RedHat-7.yml @@ -3,7 +3,7 @@ funkwhale_packages: - gcc - git - - postgresql15 + - postgresql16 - postgresql-devel - openldap-devel - cyrus-sasl-devel diff --git a/roles/funkwhale/vars/RedHat-8.yml b/roles/funkwhale/vars/RedHat-8.yml index 9e5edd2..feeeadc 100644 --- a/roles/funkwhale/vars/RedHat-8.yml +++ b/roles/funkwhale/vars/RedHat-8.yml @@ -3,7 +3,7 @@ funkwhale_packages: - gcc - git - - postgresql15 + - postgresql16 - postgresql-devel - openldap-devel - cyrus-sasl-devel diff --git a/roles/mailman/tasks/archive_pre.yml b/roles/mailman/tasks/archive_pre.yml index 473513e..7c7f86d 100644 --- a/roles/mailman/tasks/archive_pre.yml +++ b/roles/mailman/tasks/archive_pre.yml @@ -20,7 +20,7 @@ - name: Dump the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ mailman_db_server | quote }} diff --git a/roles/mailman/templates/pre-backup.sh.j2 b/roles/mailman/templates/pre-backup.sh.j2 index 0ce5e39..9e571ed 100644 --- a/roles/mailman/templates/pre-backup.sh.j2 +++ b/roles/mailman/templates/pre-backup.sh.j2 @@ -6,7 +6,7 @@ set -eo pipefail {% if mailman_db_engine == 'postgres' %} {% if mailman_db_server not in ['localhost', '127.0.0.1'] %} PGPASSWORD={{ mailman_db_pass | quote }} \ - /usr/pgsql-15/bin/pg_dump \ + /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ mailman_db_user | quote }} \ @@ -15,7 +15,7 @@ PGPASSWORD={{ mailman_db_pass | quote }} \ {{ mailman_db_name[db] }} | \ zstd -c > {{ mailman_root_dir }}/backup/{{ mailman_db_name[db] }}.sql.zst {% else %} -su - postgres -c "/usr/pgsql-15/bin/pg_dump --clear {{ mailman_db_name[db] }}" | \ +su - postgres -c "/usr/pgsql-16/bin/pg_dump --clear {{ mailman_db_name[db] }}" | \ {% endif %} zstd -c > {{ mailman_root_dir }}/backup/{{ mailman_db_name[db] }}.sql.zst {% else %} diff --git a/roles/matrix_synapse/tasks/archive_pre.yml b/roles/matrix_synapse/tasks/archive_pre.yml index c4ef4da..02709c9 100644 --- a/roles/matrix_synapse/tasks/archive_pre.yml +++ b/roles/matrix_synapse/tasks/archive_pre.yml @@ -19,7 +19,7 @@ - name: Archive a database dump shell: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ synapse_pg_db_server }} diff --git a/roles/matrix_synapse/templates/pre-backup.sh.j2 b/roles/matrix_synapse/templates/pre-backup.sh.j2 index fa3a6a4..0a6837e 100644 --- a/roles/matrix_synapse/templates/pre-backup.sh.j2 +++ b/roles/matrix_synapse/templates/pre-backup.sh.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD='{{ synapse_pg_db_pass }}' /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD='{{ synapse_pg_db_pass }}' /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ synapse_pg_db_user }} \ diff --git a/roles/matrix_synapse/vars/RedHat-7.yml b/roles/matrix_synapse/vars/RedHat-7.yml index 880df0c..7c7d97d 100644 --- a/roles/matrix_synapse/vars/RedHat-7.yml +++ b/roles/matrix_synapse/vars/RedHat-7.yml @@ -17,7 +17,7 @@ synapse_packages: - libtool - autoconf - automake - - postgresql15 + - postgresql16 - postgresql-devel - libpqxx-devel - jemalloc diff --git a/roles/matrix_synapse/vars/RedHat-8.yml b/roles/matrix_synapse/vars/RedHat-8.yml index 16146e7..3727da0 100644 --- a/roles/matrix_synapse/vars/RedHat-8.yml +++ b/roles/matrix_synapse/vars/RedHat-8.yml @@ -17,7 +17,7 @@ synapse_packages: - libtool - autoconf - automake - - postgresql15 + - postgresql16 - postgresql-devel - jemalloc - python39-pip diff --git a/roles/matrix_synapse/vars/RedHat-9.yml b/roles/matrix_synapse/vars/RedHat-9.yml index c6d948e..aa3c2c7 100644 --- a/roles/matrix_synapse/vars/RedHat-9.yml +++ b/roles/matrix_synapse/vars/RedHat-9.yml @@ -17,7 +17,7 @@ synapse_packages: - libtool - autoconf - automake - - postgresql15 + - postgresql16 - postgresql-devel - jemalloc - python3-pip diff --git a/roles/metabase/tasks/archive_pre.yml b/roles/metabase/tasks/archive_pre.yml index 45416f0..0fca43d 100644 --- a/roles/metabase/tasks/archive_pre.yml +++ b/roles/metabase/tasks/archive_pre.yml @@ -39,7 +39,7 @@ - name: Dump the database shell: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ metabase_db_server }} diff --git a/roles/metabase/tasks/install.yml b/roles/metabase/tasks/install.yml index 2b4b0c7..811d4ac 100644 --- a/roles/metabase/tasks/install.yml +++ b/roles/metabase/tasks/install.yml @@ -98,7 +98,7 @@ - when: metabase_db_engine == 'postgres' block: - name: Install postgresql client - package: name=postgresql15 + package: name=postgresql16 - name: Create postgres user postgresql_user: diff --git a/roles/metabase/templates/pre-backup.j2 b/roles/metabase/templates/pre-backup.j2 index 4c6da77..03a0c2f 100644 --- a/roles/metabase/templates/pre-backup.j2 +++ b/roles/metabase/templates/pre-backup.j2 @@ -13,7 +13,7 @@ set -eo pipefail --quick --single-transaction \ --add-drop-table {{ metabase_db_name | quote }} | zstd -c > {{ metabase_root_dir }}/backup/{{ metabase_db_name }}.sql.zst {% elif metabase_db_engine == 'postgres' %} -PGPASSWORD={{ metabase_db_pass | quote }} /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD={{ metabase_db_pass | quote }} /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ metabase_db_user }} \ diff --git a/roles/miniflux/tasks/archive_pre.yml b/roles/miniflux/tasks/archive_pre.yml index 50fd937..1ba1ddd 100644 --- a/roles/miniflux/tasks/archive_pre.yml +++ b/roles/miniflux/tasks/archive_pre.yml @@ -9,12 +9,12 @@ tags: miniflux - name: Install pg_dump - package: name=postgresql15 + package: name=postgresql16 tags: miniflux - name: Backup the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ miniflux_db_server }} diff --git a/roles/miniflux/tasks/install.yml b/roles/miniflux/tasks/install.yml index 3bce181..ba2d952 100644 --- a/roles/miniflux/tasks/install.yml +++ b/roles/miniflux/tasks/install.yml @@ -5,7 +5,7 @@ name: - tar - zstd - - postgresql15 + - postgresql16 tags: miniflux - name: Download miniflux diff --git a/roles/miniflux/templates/pre-backup.j2 b/roles/miniflux/templates/pre-backup.j2 index cdfe069..380502b 100644 --- a/roles/miniflux/templates/pre-backup.j2 +++ b/roles/miniflux/templates/pre-backup.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD='{{ miniflux_db_pass }}' /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD='{{ miniflux_db_pass }}' /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ miniflux_db_user | quote }} \ diff --git a/roles/n8n/tasks/archive_pre.yml b/roles/n8n/tasks/archive_pre.yml index 7de4e26..55f4d83 100644 --- a/roles/n8n/tasks/archive_pre.yml +++ b/roles/n8n/tasks/archive_pre.yml @@ -22,7 +22,7 @@ - name: Backup the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --format=custom --clean --create diff --git a/roles/n8n/tasks/install.yml b/roles/n8n/tasks/install.yml index 538dcf7..ea96854 100644 --- a/roles/n8n/tasks/install.yml +++ b/roles/n8n/tasks/install.yml @@ -9,7 +9,7 @@ - make - sqlite-devel - python3 - - postgresql15 + - postgresql16 tags: n8n - name: Wipe node_module on upgrade diff --git a/roles/n8n/templates/pre-backup.sh.j2 b/roles/n8n/templates/pre-backup.sh.j2 index 0c040ad..149dc7e 100644 --- a/roles/n8n/templates/pre-backup.sh.j2 +++ b/roles/n8n/templates/pre-backup.sh.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD='{{ n8n_db_pass }}' /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD='{{ n8n_db_pass }}' /usr/pgsql-16/bin/pg_dump \ --format=custom \ --clean \ --create \ diff --git a/roles/nomad/tasks/install.yml b/roles/nomad/tasks/install.yml index 6610a9a..4a0197e 100644 --- a/roles/nomad/tasks/install.yml +++ b/roles/nomad/tasks/install.yml @@ -1,5 +1,9 @@ --- +- name: Install general packages + package: name={{ nomad_packages }} + tags: nomad + - name: Install task driver packages package: name={{ nomad_task_driver_packages[item] }} loop: "{{ nomad_enabled_task_drivers }}" diff --git a/roles/nomad/vars/RedHat.yml b/roles/nomad/vars/RedHat.yml index e0753de..8f7eae8 100644 --- a/roles/nomad/vars/RedHat.yml +++ b/roles/nomad/vars/RedHat.yml @@ -5,6 +5,7 @@ nomad_packages: - zstd - unzip - acl + - git # Note : there's no package for the Docker driver as it'll pull the docker role already nomad_task_driver_packages: diff --git a/roles/odoo/tasks/archive_pre.yml b/roles/odoo/tasks/archive_pre.yml index 78dafc9..216926b 100644 --- a/roles/odoo/tasks/archive_pre.yml +++ b/roles/odoo/tasks/archive_pre.yml @@ -7,7 +7,7 @@ - name: Install postgresql client package: name: - - postgresql15 + - postgresql16 tags: odoo - name: Stop the server during upgrade @@ -29,7 +29,7 @@ - name: Dump the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ odoo_db_server | quote }} diff --git a/roles/odoo/templates/pre-backup.sh.j2 b/roles/odoo/templates/pre-backup.sh.j2 index 05c0dfb..9ab69b2 100644 --- a/roles/odoo/templates/pre-backup.sh.j2 +++ b/roles/odoo/templates/pre-backup.sh.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD={{ odoo_db_pass | quote }} /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD={{ odoo_db_pass | quote }} /usr/pgsql-16/bin/pg_dump \ --format=custom \ --clean \ --username={{ odoo_db_user }} \ diff --git a/roles/odoo/vars/RedHat-8.yml b/roles/odoo/vars/RedHat-8.yml index 5540706..1e0c945 100644 --- a/roles/odoo/vars/RedHat-8.yml +++ b/roles/odoo/vars/RedHat-8.yml @@ -12,7 +12,7 @@ odoo_packages: #- nodejs-less - tar - zstd - - postgresql15 # for pg_dump + - postgresql16 # for pg_dump - git - acl diff --git a/roles/paperless_ng/tasks/archive_pre.yml b/roles/paperless_ng/tasks/archive_pre.yml index a2f857d..5703ca6 100644 --- a/roles/paperless_ng/tasks/archive_pre.yml +++ b/roles/paperless_ng/tasks/archive_pre.yml @@ -7,7 +7,7 @@ - name: Install postgresql client package: name: - - postgresql15 + - postgresql16 tags: ged - name: Archive previous version @@ -25,7 +25,7 @@ - name: Dump the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ paperless_db_server | quote }} diff --git a/roles/paperless_ng/templates/pre-backup.j2 b/roles/paperless_ng/templates/pre-backup.j2 index ce577cf..fc5b4cc 100644 --- a/roles/paperless_ng/templates/pre-backup.j2 +++ b/roles/paperless_ng/templates/pre-backup.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD='{{ paperless_db_pass }}' /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD='{{ paperless_db_pass }}' /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ paperless_db_user | quote }} \ diff --git a/roles/penpot/tasks/archive_pre.yml b/roles/penpot/tasks/archive_pre.yml index 16b5dfa..22f1cfb 100644 --- a/roles/penpot/tasks/archive_pre.yml +++ b/roles/penpot/tasks/archive_pre.yml @@ -25,12 +25,12 @@ tags: penpot - name: Install postgresql client - package: name=postgresql15 + package: name=postgresql16 tags: penpot - name: Dump the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ penpot_db_server | quote }} diff --git a/roles/penpot/templates/pre-backup.j2 b/roles/penpot/templates/pre-backup.j2 index 2ff62b4..9873e10 100644 --- a/roles/penpot/templates/pre-backup.j2 +++ b/roles/penpot/templates/pre-backup.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD='{{ penpot_db_pass }}' /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD='{{ penpot_db_pass }}' /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ penpot_db_user | quote }} \ diff --git a/roles/pgadmin4/templates/config_local.py.j2 b/roles/pgadmin4/templates/config_local.py.j2 index ca73148..80dea57 100644 --- a/roles/pgadmin4/templates/config_local.py.j2 +++ b/roles/pgadmin4/templates/config_local.py.j2 @@ -13,7 +13,7 @@ SHOW_GRAVATAR_IMAGE=False SECURITY_EMAIL_SENDER='no-reply@{{ ansible_domain }}' UPGRADE_CHECK_ENABLED=False DEFAULT_BINARY_PATHS = { - "pg": "/usr/pgsql-15/bin/" + "pg": "/usr/pgsql-16/bin/" } {% if pga_auth | length >= 1 %} AUTHENTICATION_SOURCES=['{{ pga_auth | join('\',\'') }}'] diff --git a/roles/pgadmin4/vars/RedHat-7.yml b/roles/pgadmin4/vars/RedHat-7.yml index 56c7667..cfa916a 100644 --- a/roles/pgadmin4/vars/RedHat-7.yml +++ b/roles/pgadmin4/vars/RedHat-7.yml @@ -4,7 +4,7 @@ pgadmin4_packages: - gcc - postgresql - postgresql-devel - - postgresql15 + - postgresql16 - python3-virtualenv - python3-pip - python-setuptools # Needed for pip install expect diff --git a/roles/pgadmin4/vars/RedHat-8.yml b/roles/pgadmin4/vars/RedHat-8.yml index fba5d25..09fce11 100644 --- a/roles/pgadmin4/vars/RedHat-8.yml +++ b/roles/pgadmin4/vars/RedHat-8.yml @@ -4,7 +4,7 @@ pgadmin4_packages: - gcc - postgresql - postgresql-devel - - postgresql15 + - postgresql16 - python3-virtualenv - python3-pip - python3-setuptools # Needed for pip install expect diff --git a/roles/repo_base/templates/postgresql-client.repo.j2 b/roles/repo_base/templates/postgresql-client.repo.j2 index ab4bd75..ad85717 100644 --- a/roles/repo_base/templates/postgresql-client.repo.j2 +++ b/roles/repo_base/templates/postgresql-client.repo.j2 @@ -1,9 +1,9 @@ [postgresql-client] -baseurl = https://download.postgresql.org/pub/repos/yum/15/redhat/rhel-$releasever-$basearch +baseurl = https://download.postgresql.org/pub/repos/yum/16/redhat/rhel-$releasever-$basearch gpgcheck = 1 -gpgkey = https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-15 +gpgkey = https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL name = PostgreSQL Client -includepkgs = postgresql15 postgresql15-libs +includepkgs = postgresql16 postgresql16-libs {% if ansible_os_family == 'RedHat' and ansible_distribution_major_version is version('8', '>=') %} # Workaround a bug in dnf which would make the default module mask packages from postgres repo module_hotfixes = true diff --git a/roles/repo_postgresql/templates/postgresql.repo.j2 b/roles/repo_postgresql/templates/postgresql.repo.j2 index 345713c..ba486bb 100644 --- a/roles/repo_postgresql/templates/postgresql.repo.j2 +++ b/roles/repo_postgresql/templates/postgresql.repo.j2 @@ -2,7 +2,7 @@ [postgresql] baseurl = https://download.postgresql.org/pub/repos/yum/{{ pg_version }}/redhat/rhel-$releasever-$basearch gpgcheck = 1 -gpgkey = https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ pg_version }} +gpgkey = https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL name = PostgreSQL {% if ansible_os_family == 'RedHat' and ansible_distribution_major_version is version('8', '>=') %} # Workaround a bug in dnf which would make the default module mask packages from postgres repo @@ -13,7 +13,7 @@ exclude = python3-psycopg2 [postgresql-common] baseurl = https://download.postgresql.org/pub/repos/yum/common/redhat/rhel-$releasever-$basearch gpgcheck = 1 -gpgkey = https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG +gpgkey = https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL name = PostgreSQL Common exclude = python3-psycopg2,libpq5 {% endif %} diff --git a/roles/squash_tm/tasks/archive_pre.yml b/roles/squash_tm/tasks/archive_pre.yml index d3face0..360be71 100644 --- a/roles/squash_tm/tasks/archive_pre.yml +++ b/roles/squash_tm/tasks/archive_pre.yml @@ -43,11 +43,11 @@ - when: squashtm_db_engine == 'postgres' block: - name: Install pg_dump - package: name=postgresql15 + package: name=postgresql16 - name: Dump the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ squashtm_db_server | quote }} diff --git a/roles/squash_tm/templates/pre-backup.j2 b/roles/squash_tm/templates/pre-backup.j2 index 644c9f2..52edaa0 100644 --- a/roles/squash_tm/templates/pre-backup.j2 +++ b/roles/squash_tm/templates/pre-backup.j2 @@ -5,7 +5,7 @@ set -eo pipefail {% if squashtm_db_engine == 'postgres' %} {% if squashtm_db_server not in ['localhost', '127.0.0.1'] %} PGPASSWORD={{ squashtm_db_pass | quote }} \ - /usr/pgsql-15/bin/pg_dump \ + /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ squashtm_db_user | quote }} \ @@ -13,7 +13,7 @@ PGPASSWORD={{ squashtm_db_pass | quote }} \ --port={{ squashtm_db_port }} \ {{ squashtm_db_name }} | \ {% else %} -su - postgres -c "/usr/pgsql-15/bin/pg_dump --clear {{ squashtm_db_name }}" | \ +su - postgres -c "/usr/pgsql-16/bin/pg_dump --clear {{ squashtm_db_name }}" | \ {% endif %} zstd -c > {{ squashtm_root_dir }}/backup/{{ squashtm_db_name }}.sql.zst {% else %} diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains index 0b55020..7b77c3c 100644 --- a/roles/squid/files/acl/software_various.domains +++ b/roles/squid/files/acl/software_various.domains @@ -402,3 +402,6 @@ download.copr.fedorainfracloud.org update.ixsystems.com update.freenas.org apt.tn.ixsystems.com + +# Seafile +s3.eu-central-1.amazonaws.com diff --git a/roles/taiga/tasks/archive_pre.yml b/roles/taiga/tasks/archive_pre.yml index 16bca5c..5f2766d 100644 --- a/roles/taiga/tasks/archive_pre.yml +++ b/roles/taiga/tasks/archive_pre.yml @@ -11,7 +11,7 @@ - name: Install postgresql client package: name: - - postgresql15 + - postgresql16 tags: taiga - name: Stop services during upgrade @@ -39,7 +39,7 @@ - name: Dump the database command: > - /usr/pgsql-15/bin/pg_dump + /usr/pgsql-16/bin/pg_dump --clean --create --host={{ taiga_db_server | quote }} diff --git a/roles/taiga/templates/pre-backup.j2 b/roles/taiga/templates/pre-backup.j2 index c1abc70..b4ca5d3 100644 --- a/roles/taiga/templates/pre-backup.j2 +++ b/roles/taiga/templates/pre-backup.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD='{{ taiga_db_pass }}' /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD='{{ taiga_db_pass }}' /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ taiga_db_user | quote }} \ diff --git a/roles/taiga/vars/RedHat-8.yml b/roles/taiga/vars/RedHat-8.yml index f2234e4..9cfb8e9 100644 --- a/roles/taiga/vars/RedHat-8.yml +++ b/roles/taiga/vars/RedHat-8.yml @@ -22,7 +22,7 @@ taiga_packages: - curl - tmux - gettext - - postgresql15 + - postgresql16 - postgresql-devel - libpq-devel - libxml2-devel diff --git a/roles/wapt_server/templates/pre-backup.sh.j2 b/roles/wapt_server/templates/pre-backup.sh.j2 index 1abec7a..5527a90 100644 --- a/roles/wapt_server/templates/pre-backup.sh.j2 +++ b/roles/wapt_server/templates/pre-backup.sh.j2 @@ -2,7 +2,7 @@ set -eo pipefail -PGPASSWORD={{ wapt_db_pass | quote }} /usr/pgsql-15/bin/pg_dump \ +PGPASSWORD={{ wapt_db_pass | quote }} /usr/pgsql-16/bin/pg_dump \ --clean \ --create \ --username={{ wapt_db_user | quote }} \ diff --git a/roles/wapt_server/vars/RedHat-7.yml b/roles/wapt_server/vars/RedHat-7.yml index c62e997..8fb236e 100644 --- a/roles/wapt_server/vars/RedHat-7.yml +++ b/roles/wapt_server/vars/RedHat-7.yml @@ -3,5 +3,5 @@ wapt_packages: - tis-waptserver - tis-waptsetup - - postgresql15 + - postgresql16 - python-psycopg2 # Needed to manage PG with ansible diff --git a/roles/wapt_server/vars/RedHat-8.yml b/roles/wapt_server/vars/RedHat-8.yml index 98bec1d..a9e39e0 100644 --- a/roles/wapt_server/vars/RedHat-8.yml +++ b/roles/wapt_server/vars/RedHat-8.yml @@ -3,5 +3,5 @@ wapt_packages: - tis-waptserver - tis-waptsetup - - postgresql15 + - postgresql16 - python3-psycopg2 # Needed to manage PG with ansible