From 138c0bf3b286633da8a793c2f3732bfa5da53817 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 11 Apr 2023 15:00:42 +0200 Subject: [PATCH] Update to 2023-04-11 15:00 --- roles/babashka/defaults/main.yml | 2 +- roles/consul/defaults/main.yml | 15 ++++++++-- roles/consul/templates/reload.hcl.j2 | 9 ++++++ 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_element/defaults/main.yml | 4 +-- roles/matrix_synapse/tasks/archive_pre.yml | 2 +- .../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/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 | 2 +- roles/miniflux/tasks/install.yml | 2 +- roles/miniflux/templates/pre-backup.j2 | 2 +- .../ansible_conf.d/09-cacheable.conf.j2 | 2 ++ .../templates/ansible_conf.d/perf.inc.j2 | 6 +++- 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/patrix/tasks/install_Debian.yml | 1 + roles/penpot/defaults/main.yml | 4 +-- roles/penpot/tasks/archive_pre.yml | 6 +++- roles/penpot/templates/nginx.conf.j2 | 8 +++--- 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 +- .../templates/postgresql-client.repo.j2 | 6 ++-- roles/repo_samba4/defaults/main.yml | 2 +- roles/squash_tm/tasks/archive_pre.yml | 4 +-- roles/squash_tm/templates/pre-backup.j2 | 4 +-- roles/taiga/defaults/main.yml | 26 +++++++++--------- roles/taiga/tasks/archive_pre.yml | 4 +-- roles/taiga/tasks/conf.yml | 3 +- roles/taiga/tasks/install.yml | 2 ++ roles/taiga/templates/pre-backup.j2 | 2 +- roles/taiga/vars/RedHat-8.yml | 2 +- roles/vaultwarden/defaults/main.yml | 4 +-- .../wapt_server/templates/.rsyncd.conf.j2.swp | Bin 12288 -> 0 bytes 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 +- roles/zfs/templates/syncoid.service.j2 | 2 +- 55 files changed, 113 insertions(+), 79 deletions(-) delete mode 100644 roles/wapt_server/templates/.rsyncd.conf.j2.swp diff --git a/roles/babashka/defaults/main.yml b/roles/babashka/defaults/main.yml index a86552b..cb132f8 100644 --- a/roles/babashka/defaults/main.yml +++ b/roles/babashka/defaults/main.yml @@ -5,4 +5,4 @@ bb_version: 1.3.176 # URL of the archive bb_archive_url: https://github.com/babashka/babashka/releases/download/v{{ bb_version }}/babashka-{{ bb_version }}-linux-amd64-static.tar.gz # Expected sha256sum of the archive -bb_archive_sha256: d93770c3fa03b81652db19d14e181406841d75756731ad6b1196929ea0cd183b +bb_archive_sha256: b1772d2b04399ed981803b380307888a58068803ecf2c0cd22c43e83b811a9f8 diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml index 35b4b53..d9d5cfd 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.15.1 +consul_version: 1.15.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: 23f7eb0461dd01a95c5d56472b91c22d5dacec84f31f1846c0c9f9621f98f29f +consul_archive_sha256: 21e6c204f8dfdfde63eed5853fbf5a84d414299a111ad6b66da36d00db6414e9 # user account under which consul will run (will be created if needed) consul_user: consul @@ -183,3 +183,14 @@ consul_base_services: consul_extra_services: {} consul_host_services: {} consul_services: "{{ consul_base_services | combine(consul_extra_services, recursive=True) | combine(consul_host_services, recursive=True) }}" + +# Services can be manually registered on the catalog +# consul_extra_catalog_services: +# service-id: +# name: my-service +# address: 10.1.0.26 +# port: 8080 +consul_base_catalog_services: {} +consul_extra_catalog_services: {} +consul_host_catalog_services: {} +consul_catalog_services: "{{ consul_base_catalog_services | combine(consul_extra_catalog_services, recursive=True) | combine(consul_host_catalog_services, recursive=True) }}" diff --git a/roles/consul/templates/reload.hcl.j2 b/roles/consul/templates/reload.hcl.j2 index 2bfe04b..c0095d3 100644 --- a/roles/consul/templates/reload.hcl.j2 +++ b/roles/consul/templates/reload.hcl.j2 @@ -6,3 +6,12 @@ node_meta { {% endfor %} } +{% for service in consul_catalog_services.keys() | list %} +services { + id = "{{ service }}" + name = "{{ consul_extra_catalog_services[service].name }}" + address = "{{ consul_extra_catalog_services[service].address }}" + port = {{ consul_extra_catalog_services[service].port }} +} +{% endfor %} + diff --git a/roles/consul_template/defaults/main.yml b/roles/consul_template/defaults/main.yml index 16fa092..261a066 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.30.0 +consul_tpl_version: 0.31.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: c78db0f0eecc4d314a5130e3b4c8bd17086c6cd9080c4caf69c606de67cbe212 +consul_tpl_archive_sha256: e622fd89e731882264f170ede87023546a306f07bad42e816468223d5a6d57f4 # 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 7a0db2e..ac40880 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-14/bin/pg_dump + /usr/pgsql-15/bin/pg_dump --clean --create --host={{ documize_db_server }} diff --git a/roles/documize/tasks/install.yml b/roles/documize/tasks/install.yml index 70d0313..2b8cef9 100644 --- a/roles/documize/tasks/install.yml +++ b/roles/documize/tasks/install.yml @@ -5,7 +5,7 @@ name: - tar - zstd - - postgresql14 + - postgresql15 tags: documize - name: Download documize diff --git a/roles/documize/templates/pre-backup.j2 b/roles/documize/templates/pre-backup.j2 index e82ec85..8bf1810 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-14/bin/pg_dump \ +PGPASSWORD={{ documize_db_pass | quote }} /usr/pgsql-15/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-14/bin/pg_dump --clean --create {{ documize_db_name | quote }}" | \ +su - postgres -c "/usr/pgsql-15/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 8dc0d19..d1424ce 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-14/bin/pg_dump + /usr/pgsql-15/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 3afe803..e641468 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-14/bin/pg_dump \ +PGPASSWORD={{ funkwhale_db_pass | quote }} /usr/pgsql-15/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 afc9ca4..e492d5b 100644 --- a/roles/funkwhale/vars/RedHat-7.yml +++ b/roles/funkwhale/vars/RedHat-7.yml @@ -3,7 +3,7 @@ funkwhale_packages: - gcc - git - - postgresql14 + - postgresql15 - postgresql-devel - openldap-devel - cyrus-sasl-devel diff --git a/roles/funkwhale/vars/RedHat-8.yml b/roles/funkwhale/vars/RedHat-8.yml index 6936f30..9e5edd2 100644 --- a/roles/funkwhale/vars/RedHat-8.yml +++ b/roles/funkwhale/vars/RedHat-8.yml @@ -3,7 +3,7 @@ funkwhale_packages: - gcc - git - - postgresql14 + - postgresql15 - postgresql-devel - openldap-devel - cyrus-sasl-devel diff --git a/roles/mailman/tasks/archive_pre.yml b/roles/mailman/tasks/archive_pre.yml index a035f17..473513e 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-14/bin/pg_dump + /usr/pgsql-15/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 80dacd6..0ce5e39 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-14/bin/pg_dump \ + /usr/pgsql-15/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-14/bin/pg_dump --clear {{ mailman_db_name[db] }}" | \ +su - postgres -c "/usr/pgsql-15/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_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml index 928112c..1e2143d 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.26 -element_archive_sha256: 0821f96eafe0e46c15a9e0fadc6a4f4a185d77cde2c764f59b3a22403fefb0e6 +element_version: 1.11.27 +element_archive_sha256: 6d02e197017e1fa7e4f9418a55ed2435baeffd1d3f670f4706dcc62336913ea2 # Where to install element element_root_dir: /opt/matrix/element diff --git a/roles/matrix_synapse/tasks/archive_pre.yml b/roles/matrix_synapse/tasks/archive_pre.yml index ed3f8a4..c4ef4da 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-14/bin/pg_dump + /usr/pgsql-15/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 dea5491..fa3a6a4 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-14/bin/pg_dump \ +PGPASSWORD='{{ synapse_pg_db_pass }}' /usr/pgsql-15/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 f967275..880df0c 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 - - postgresql14 + - postgresql15 - postgresql-devel - libpqxx-devel - jemalloc diff --git a/roles/matrix_synapse/vars/RedHat-8.yml b/roles/matrix_synapse/vars/RedHat-8.yml index 24ef8a4..16146e7 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 - - postgresql14 + - postgresql15 - postgresql-devel - jemalloc - python39-pip diff --git a/roles/metabase/tasks/archive_pre.yml b/roles/metabase/tasks/archive_pre.yml index 0e8349d..45416f0 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-14/bin/pg_dump + /usr/pgsql-15/bin/pg_dump --clean --create --host={{ metabase_db_server }} diff --git a/roles/metabase/tasks/install.yml b/roles/metabase/tasks/install.yml index 4b929fe..2b4b0c7 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=postgresql14 + package: name=postgresql15 - name: Create postgres user postgresql_user: diff --git a/roles/metabase/templates/pre-backup.j2 b/roles/metabase/templates/pre-backup.j2 index b10a8e9..4c6da77 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-14/bin/pg_dump \ +PGPASSWORD={{ metabase_db_pass | quote }} /usr/pgsql-15/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 ecd1803..e32fde1 100644 --- a/roles/miniflux/tasks/archive_pre.yml +++ b/roles/miniflux/tasks/archive_pre.yml @@ -10,7 +10,7 @@ - name: Backup the database command: > - /usr/pgsql-14/bin/pg_dump + /usr/pgsql-15/bin/pg_dump --clean --create --host={{ miniflux_db_server }} diff --git a/roles/miniflux/tasks/install.yml b/roles/miniflux/tasks/install.yml index 442b071..3bce181 100644 --- a/roles/miniflux/tasks/install.yml +++ b/roles/miniflux/tasks/install.yml @@ -5,7 +5,7 @@ name: - tar - zstd - - postgresql14 + - postgresql15 tags: miniflux - name: Download miniflux diff --git a/roles/miniflux/templates/pre-backup.j2 b/roles/miniflux/templates/pre-backup.j2 index 412446e..cdfe069 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-14/bin/pg_dump \ +PGPASSWORD='{{ miniflux_db_pass }}' /usr/pgsql-15/bin/pg_dump \ --clean \ --create \ --username={{ miniflux_db_user | quote }} \ diff --git a/roles/nginx/templates/ansible_conf.d/09-cacheable.conf.j2 b/roles/nginx/templates/ansible_conf.d/09-cacheable.conf.j2 index 26e8267..4edbf69 100644 --- a/roles/nginx/templates/ansible_conf.d/09-cacheable.conf.j2 +++ b/roles/nginx/templates/ansible_conf.d/09-cacheable.conf.j2 @@ -15,6 +15,8 @@ map $sent_http_content_type $is_client_cacheable { application/font-woff 1; application/vnd.ms-fontobject 1; application/vnd.ms-opentype 1; +# application/octet-stream 1; + application/wasm 1; } map $request_uri $is_proxy_cacheable { diff --git a/roles/nginx/templates/ansible_conf.d/perf.inc.j2 b/roles/nginx/templates/ansible_conf.d/perf.inc.j2 index 6fe8ae6..57dbcfe 100644 --- a/roles/nginx/templates/ansible_conf.d/perf.inc.j2 +++ b/roles/nginx/templates/ansible_conf.d/perf.inc.j2 @@ -16,8 +16,12 @@ gzip_types font/opentype font/ttf application/font-woff + application/x-font-ttf application/vnd.ms-fontobject - application/vnd.ms-opentype; + application/vnd.ms-opentype + application/wasm + application/rtf + application/octet-stream; gzip_vary on; gzip_disable "msie6"; expires $custom_expires; diff --git a/roles/odoo/tasks/archive_pre.yml b/roles/odoo/tasks/archive_pre.yml index 59a1a75..78dafc9 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: - - postgresql14 + - postgresql15 tags: odoo - name: Stop the server during upgrade @@ -29,7 +29,7 @@ - name: Dump the database command: > - /usr/pgsql-14/bin/pg_dump + /usr/pgsql-15/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 9ddddc7..05c0dfb 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-14/bin/pg_dump \ +PGPASSWORD={{ odoo_db_pass | quote }} /usr/pgsql-15/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 145299d..b277e24 100644 --- a/roles/odoo/vars/RedHat-8.yml +++ b/roles/odoo/vars/RedHat-8.yml @@ -12,6 +12,6 @@ odoo_packages: #- nodejs-less - tar - zstd - - postgresql14 # for pg_dump + - postgresql15 # for pg_dump odoo_venv_command: /bin/python3.9 -m venv diff --git a/roles/paperless_ng/tasks/archive_pre.yml b/roles/paperless_ng/tasks/archive_pre.yml index 3b47300..a2f857d 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: - - postgresql14 + - postgresql15 tags: ged - name: Archive previous version @@ -25,7 +25,7 @@ - name: Dump the database command: > - /usr/pgsql-14/bin/pg_dump + /usr/pgsql-15/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 9c4d611..ce577cf 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-14/bin/pg_dump \ +PGPASSWORD='{{ paperless_db_pass }}' /usr/pgsql-15/bin/pg_dump \ --clean \ --create \ --username={{ paperless_db_user | quote }} \ diff --git a/roles/patrix/tasks/install_Debian.yml b/roles/patrix/tasks/install_Debian.yml index e9ae721..6a4c4ec 100644 --- a/roles/patrix/tasks/install_Debian.yml +++ b/roles/patrix/tasks/install_Debian.yml @@ -12,6 +12,7 @@ - libjson-perl - libterm-readkey-perl - libhash-merge-simple-perl + - libhtml-strip-perl - acl tags: patrix diff --git a/roles/penpot/defaults/main.yml b/roles/penpot/defaults/main.yml index 2c20fdb..7675339 100644 --- a/roles/penpot/defaults/main.yml +++ b/roles/penpot/defaults/main.yml @@ -1,7 +1,7 @@ --- # Penpot version to deploy -penpot_version: 1.17.1 +penpot_version: 1.18.1 # SHould ansible manage upgrades. If False, only the initial install will be done penpot_manage_upgrade: True @@ -10,7 +10,7 @@ penpot_root_dir: /opt/penpot # URL of the archive penpot_archive_url: https://github.com/penpot/penpot/archive/refs/tags/{{ penpot_version }}.tar.gz # Expected sha256 of the archive -penpot_archive_sha256: 68b2397fe9d994f1ba3e1cf38b2e280853c978bccad202fcceed67f2cc1d627c +penpot_archive_sha256: 85d340b136f54013e857af0a00d70c6049ae48b9122677fd08f37f297cf418b8 # User under which penpot will run. Will be created penpot_user: penpot diff --git a/roles/penpot/tasks/archive_pre.yml b/roles/penpot/tasks/archive_pre.yml index bd722fa..16b5dfa 100644 --- a/roles/penpot/tasks/archive_pre.yml +++ b/roles/penpot/tasks/archive_pre.yml @@ -24,9 +24,13 @@ - etc tags: penpot +- name: Install postgresql client + package: name=postgresql15 + tags: penpot + - name: Dump the database command: > - /usr/pgsql-14/bin/pg_dump + /usr/pgsql-15/bin/pg_dump --clean --create --host={{ penpot_db_server | quote }} diff --git a/roles/penpot/templates/nginx.conf.j2 b/roles/penpot/templates/nginx.conf.j2 index 99c4977..bcf16eb 100644 --- a/roles/penpot/templates/nginx.conf.j2 +++ b/roles/penpot/templates/nginx.conf.j2 @@ -23,6 +23,10 @@ server { add_header Cache-Control "no-cache, max-age=0" always; } + location /api/export { + proxy_pass http://localhost:{{ penpot_ports['exporter'] }}; + } + location /api { proxy_pass http://localhost:{{ penpot_ports['backend'] }}/api; } @@ -31,10 +35,6 @@ server { proxy_pass http://localhost:{{ penpot_ports['backend'] }}/dbg; } - location /export { - proxy_pass http://localhost:{{ penpot_ports['exporter'] }}; - } - location /ws/notifications { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/roles/penpot/templates/pre-backup.j2 b/roles/penpot/templates/pre-backup.j2 index f2e6170..2ff62b4 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-14/bin/pg_dump \ +PGPASSWORD='{{ penpot_db_pass }}' /usr/pgsql-15/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 fa78b57..ca73148 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-14/bin/" + "pg": "/usr/pgsql-15/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 531afac..56c7667 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 - - postgresql14 + - postgresql15 - 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 225478d..fba5d25 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 - - postgresql14 + - postgresql15 - 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 834c034..ab4bd75 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/14/redhat/rhel-$releasever-$basearch +baseurl = https://download.postgresql.org/pub/repos/yum/15/redhat/rhel-$releasever-$basearch gpgcheck = 1 -gpgkey = https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-14 +gpgkey = https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-15 name = PostgreSQL Client -includepkgs = postgresql14 postgresql14-libs +includepkgs = postgresql15 postgresql15-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_samba4/defaults/main.yml b/roles/repo_samba4/defaults/main.yml index aad1cdf..dea4e71 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.18.0') }} +samba_major_version: samba-{{ (ansible_distribution_major_version is version('8','<')) | ternary('4.12.15','4.18.1') }} diff --git a/roles/squash_tm/tasks/archive_pre.yml b/roles/squash_tm/tasks/archive_pre.yml index 0f7d76b..d3face0 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=postgresql14 + package: name=postgresql15 - name: Dump the database command: > - /usr/pgsql-14/bin/pg_dump + /usr/pgsql-15/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 3821e9f..644c9f2 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-14/bin/pg_dump \ + /usr/pgsql-15/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-14/bin/pg_dump --clear {{ squashtm_db_name }}" | \ +su - postgres -c "/usr/pgsql-15/bin/pg_dump --clear {{ squashtm_db_name }}" | \ {% endif %} zstd -c > {{ squashtm_root_dir }}/backup/{{ squashtm_db_name }}.sql.zst {% else %} diff --git a/roles/taiga/defaults/main.yml b/roles/taiga/defaults/main.yml index 4547dc0..acf5f71 100644 --- a/roles/taiga/defaults/main.yml +++ b/roles/taiga/defaults/main.yml @@ -10,22 +10,22 @@ taiga_user: taiga # Archives URL, versions and expected checksums taiga_archives: back: - version: 6.5.2 - url: https://github.com/kaleidos-ventures/taiga-back/archive/refs/tags/6.5.2.tar.gz - sha256: 46a1ceb98166d71ee2ed5ac4a5a26d7b24fee65bb90afc2b80b4321feb160222 + version: 6.6.2 + url: https://github.com/kaleidos-ventures/taiga-back/archive/refs/tags/6.6.2.tar.gz + sha256: f29c52d2ac7fb647813814971d98ad0ad8c9213aeb297b50741904913a17eef5 front: - version: 6.5.2 - url: https://github.com/kaleidos-ventures/taiga-front-dist/archive/refs/tags/6.5.2.tar.gz - sha256: 54e85c024be2d6a7b1e9ba5714c82b3743f82812183d0b84747baf1dfc5312d2 - dir: taiga-front-dist-6.5.2 + version: 6.6.0 + url: https://github.com/kaleidos-ventures/taiga-front-dist/archive/refs/tags/6.6.0.tar.gz + sha256: 1c438a992c8d4c0af78eea34f6ad0e35b09758516ee1849ee1a7753f84020848 + dir: taiga-front-dist-6.6.0 events: - version: 6.5.0 - url: https://github.com/kaleidos-ventures/taiga-events/archive/refs/tags/6.5.0.tar.gz - sha256: c6307e1246b97a2aa7f53755dbceb98b24256badf8282b37b8a24b51d08b583f + version: 6.6.0 + url: https://github.com/kaleidos-ventures/taiga-events/archive/refs/tags/6.6.0.tar.gz + sha256: dcd83d1f191328f369e874631a2f00bc6b18421d8ce81a08c5dfa26c081a9762 protected: - version: 6.5.0 - url: https://github.com/kaleidos-ventures/taiga-protected/archive/refs/tags/6.5.0.tar.gz - sha256: 8465eaf078dee7b61f4fd5dbb216db94ea455b3c8d69c19c10ae33ff481e46f0 + version: 6.6.0 + url: https://github.com/kaleidos-ventures/taiga-protected/archive/refs/tags/6.6.0.tar.gz + sha256: 28d7b0f584a61a776ee3299984e5aa0d845c550bba63b5af1751050c50b089e5 # Database settings taiga_db_server: "{{ pg_server | default('localhost') }}" diff --git a/roles/taiga/tasks/archive_pre.yml b/roles/taiga/tasks/archive_pre.yml index 8114a60..16bca5c 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: - - postgresql14 + - postgresql15 tags: taiga - name: Stop services during upgrade @@ -39,7 +39,7 @@ - name: Dump the database command: > - /usr/pgsql-14/bin/pg_dump + /usr/pgsql-15/bin/pg_dump --clean --create --host={{ taiga_db_server | quote }} diff --git a/roles/taiga/tasks/conf.yml b/roles/taiga/tasks/conf.yml index d8da9a1..96edce6 100644 --- a/roles/taiga/tasks/conf.yml +++ b/roles/taiga/tasks/conf.yml @@ -99,7 +99,8 @@ - name: load initial data django_manage: - command: loaddata initial_project_templates + command: loaddata + fixtures: initial_project_templates app_path: "{{ taiga_root_dir }}/app/back" virtualenv: "{{ taiga_root_dir }}/venv" diff --git a/roles/taiga/tasks/install.yml b/roles/taiga/tasks/install.yml index 5e85d3c..60c1dee 100644 --- a/roles/taiga/tasks/install.yml +++ b/roles/taiga/tasks/install.yml @@ -81,6 +81,8 @@ virtualenv: "{{ taiga_root_dir }}/venv" virtualenv_command: /bin/python3.9 -m venv + environment: + PATH: "{{ (pg_version == 'default') | ternary('', '/usr/pgsql-' ~ pg_version ~ '/bin:') }}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" tags: taiga - block: diff --git a/roles/taiga/templates/pre-backup.j2 b/roles/taiga/templates/pre-backup.j2 index 85d28bb..c1abc70 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-14/bin/pg_dump \ +PGPASSWORD='{{ taiga_db_pass }}' /usr/pgsql-15/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 82feefc..f2234e4 100644 --- a/roles/taiga/vars/RedHat-8.yml +++ b/roles/taiga/vars/RedHat-8.yml @@ -22,7 +22,7 @@ taiga_packages: - curl - tmux - gettext - - postgresql14 + - postgresql15 - postgresql-devel - libpq-devel - libxml2-devel diff --git a/roles/vaultwarden/defaults/main.yml b/roles/vaultwarden/defaults/main.yml index 583c58e..c3bb899 100644 --- a/roles/vaultwarden/defaults/main.yml +++ b/roles/vaultwarden/defaults/main.yml @@ -1,8 +1,8 @@ --- -vaultwarden_version: 1.28.0 +vaultwarden_version: 1.28.1 vaultwarden_archive_url: https://github.com/dani-garcia/vaultwarden/archive/{{ vaultwarden_version }}.tar.gz -vaultwarden_archive_sha256: 2cd1a4e62b30a7034b3c1b50ca529b9355cd21e5e74bc8f48ef40e4928de6653 +vaultwarden_archive_sha256: d6991cba20d8aaf7559eb4b8a7d82b68476c12d4913142490839addc2562d12a vaultwarden_web_version: 2023.3.0b vaultwarden_web_archive_url: https://github.com/dani-garcia/bw_web_builds/releases/download/v{{ vaultwarden_web_version }}/bw_web_v{{ vaultwarden_web_version }}.tar.gz diff --git a/roles/wapt_server/templates/.rsyncd.conf.j2.swp b/roles/wapt_server/templates/.rsyncd.conf.j2.swp deleted file mode 100644 index f0c3c44cfaa4a528cdfcda0f74815c9b7e7b8dad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&&ubGw6bJCv91B*d|G?DRqdQ4@@}O8sOFfiINcA8kOm<$(hRx1)X3`LB>tEnK zN1^{f@8118`ZoyPeVayv#6zx@@4#dB$D231AJ{|4>(<}DJytK1I>~rKG(CK7Z>C$d zuje(gUHj(XsNLGzKS=gZj;oA+j@*>dl`k6g-Guwmo0OB(4VP1|7Ygd&Q*DZnb#vC< zeM}5LiLr5$!e`vrm2d*_L{`dAh1_{^S@pS-RFX2YmiJkQd#5xZs4OVUy{uqc?cmv1<%)bFizXcCQ)cDJI~Qs6_fXpH rhg?Lt^I`8@TeY}!A&bsWs5G*xJlTcudORNMejMiXvD(v1(i!~*b!>l@ diff --git a/roles/wapt_server/templates/pre-backup.sh.j2 b/roles/wapt_server/templates/pre-backup.sh.j2 index 316d262..1abec7a 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-14/bin/pg_dump \ +PGPASSWORD={{ wapt_db_pass | quote }} /usr/pgsql-15/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 e9aa05c..c62e997 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 - - postgresql14 + - postgresql15 - 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 defbfd1..98bec1d 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 - - postgresql14 + - postgresql15 - python3-psycopg2 # Needed to manage PG with ansible diff --git a/roles/zfs/templates/syncoid.service.j2 b/roles/zfs/templates/syncoid.service.j2 index 2758e7d..1df2a5b 100644 --- a/roles/zfs/templates/syncoid.service.j2 +++ b/roles/zfs/templates/syncoid.service.j2 @@ -4,7 +4,7 @@ Description=Sync ZFS datasets [Service] Type=oneshot PrivateTmp=yes -ExecStart=/sbin/syncoid --identifier={{ item.1.id }}{% if item.1.force | default(True) %} --force-delete {% endif %}{% if item.1.compress | default('lz4') is string %}--compress={{ item.1.compress | default('lz4') }} {%elif item.1.compress | default('lz4') == True %}--compress {% endif %}{% if item.1.recursive | default(True) == True %}--recursive{% endif %} {% if item.1.skip_parent | default(True) == True %}--skip-parent {% endif %} --sshcipher={{ item.1.ssh_cipher | default('aes128-ctr') }} {% if item.1.ssh_port is defined %}--sshport={{ item.1.ssh_port }} {% endif %}{% if item.1.bw_limit is defined %}--source-bwlimit={{ item.1.bw_limit }} {% endif %}{{ item.1.syncoid_opts | default('') }} {{ item.1.dataset }} {{ item.1.dest }} +ExecStart=/sbin/syncoid --identifier={{ item.1.id }}{% if item.1.force | default(True) %} --force-delete {% endif %}{% if item.1.compress | default('lz4') is string %} --compress={{ item.1.compress | default('lz4') }} {%elif item.1.compress | default('lz4') == True %}--compress {% endif %}{% if item.1.recursive | default(True) == True %}--recursive{% endif %} {% if item.1.skip_parent | default(True) == True %}--skip-parent {% endif %} --sshcipher={{ item.1.ssh_cipher | default('aes128-ctr') }} {% if item.1.ssh_port is defined %}--sshport={{ item.1.ssh_port }} {% endif %}{% if item.1.bw_limit is defined %}--source-bwlimit={{ item.1.bw_limit }} {% endif %}{{ item.1.syncoid_opts | default('') }} {{ item.1.dataset }} {{ item.1.dest }} {% if item.1.max_duration is defined %} TimeoutSec={{ item.1.max_duration }} {% endif %}