From 8590b558e8168c84f85fe6ed396342ddf4490e4a Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 17 Jun 2024 10:01:05 +0200 Subject: [PATCH] Update to 2024-06-17 10:01 --- roles/consul_bin/defaults/main.yml | 4 ++-- roles/consul_cni/defaults/main.yml | 8 ++++++++ roles/consul_cni/meta/main.yml | 4 ++++ roles/consul_cni/tasks/cleanup.yml | 7 +++++++ roles/consul_cni/tasks/facts.yml | 12 ++++++++++++ roles/consul_cni/tasks/install.yml | 19 +++++++++++++++++++ roles/consul_cni/tasks/main.yml | 14 ++++++++++++++ roles/consul_cni/tasks/write_version.yml | 5 +++++ roles/consul_template/defaults/main.yml | 4 ++-- roles/kimai/defaults/main.yml | 4 ++-- .../templates/llng-uwsgi.service.j2 | 1 + roles/n8n/defaults/main.yml | 2 +- roles/nomad/meta/main.yml | 2 +- roles/odoo/templates/odoo-server.service.j2 | 1 + .../squid/files/acl/software_various.domains | 1 + 15 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 roles/consul_cni/defaults/main.yml create mode 100644 roles/consul_cni/meta/main.yml create mode 100644 roles/consul_cni/tasks/cleanup.yml create mode 100644 roles/consul_cni/tasks/facts.yml create mode 100644 roles/consul_cni/tasks/install.yml create mode 100644 roles/consul_cni/tasks/main.yml create mode 100644 roles/consul_cni/tasks/write_version.yml diff --git a/roles/consul_bin/defaults/main.yml b/roles/consul_bin/defaults/main.yml index 015d2e9..75621df 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.18.2 +consul_version: 1.19.0 # 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: 522045180a4e644af6e2d97824850b470545f176aabdb4898635afda512a6a3f +consul_archive_sha256: e337fba12295fc7bab177a84a7616eb8bcc827f032a2982c8c0e417fbe86541f diff --git a/roles/consul_cni/defaults/main.yml b/roles/consul_cni/defaults/main.yml new file mode 100644 index 0000000..0b34015 --- /dev/null +++ b/roles/consul_cni/defaults/main.yml @@ -0,0 +1,8 @@ +--- + +consul_cni_version: 1.5.0 +consul_cni_archive_url: https://releases.hashicorp.com/consul-cni/{{ consul_cni_version }}/consul-cni_{{ consul_cni_version }}_linux_amd64.zip +consul_cni_archive_sha256: d81091300c65dd60b929e8ead15158e7a38b7f700c49141d7241e691a511f09d + +# Must be the same as cni_root_dir +consul_cni_root_dir: /opt/cni diff --git a/roles/consul_cni/meta/main.yml b/roles/consul_cni/meta/main.yml new file mode 100644 index 0000000..c37e782 --- /dev/null +++ b/roles/consul_cni/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - role: cni_plugins diff --git a/roles/consul_cni/tasks/cleanup.yml b/roles/consul_cni/tasks/cleanup.yml new file mode 100644 index 0000000..9e3025a --- /dev/null +++ b/roles/consul_cni/tasks/cleanup.yml @@ -0,0 +1,7 @@ +--- + +- name: Remove tmp and obsolete files + file: path={{ item }} state=absent + loop: + - "{{ cni_root_dir }}/tmp/consul-cni_{{ consul_cni_version }}_linux_amd64.zip" + tags: cni diff --git a/roles/consul_cni/tasks/facts.yml b/roles/consul_cni/tasks/facts.yml new file mode 100644 index 0000000..79a078f --- /dev/null +++ b/roles/consul_cni/tasks/facts.yml @@ -0,0 +1,12 @@ +--- + +# Detect installed version (if any) +- block: + - import_tasks: ../includes/webapps_set_install_mode.yml + vars: + - root_dir: "{{ consul_cni_root_dir }}" + - version: "{{ consul_cni_version }}" + - version_file: consul_cni_version + - set_fact: consul_cni_install_mode={{ install_mode }} + - set_fact: consul_cni_current_version={{ current_version | default('') }} + tags: cni diff --git a/roles/consul_cni/tasks/install.yml b/roles/consul_cni/tasks/install.yml new file mode 100644 index 0000000..337aa97 --- /dev/null +++ b/roles/consul_cni/tasks/install.yml @@ -0,0 +1,19 @@ +--- + +- when: consul_cni_install_mode != 'none' + block: + + - name: Download the CNI plugins + get_url: + url: "{{ consul_cni_archive_url }}" + dest: "{{ consul_cni_root_dir }}/tmp" + checksum: sha256:{{ consul_cni_archive_sha256 }} + + - name: Extract archive + unarchive: + src: "{{ consul_cni_root_dir }}/tmp/consul-cni_{{ consul_cni_version }}_linux_amd64.zip" + dest: "{{ consul_cni_root_dir }}/bin/" + include: ["consul-cni"] + remote_src: true + + tags: cni diff --git a/roles/consul_cni/tasks/main.yml b/roles/consul_cni/tasks/main.yml new file mode 100644 index 0000000..bdc786e --- /dev/null +++ b/roles/consul_cni/tasks/main.yml @@ -0,0 +1,14 @@ +--- + +- include_tasks: facts.yml + tags: always + +- include_tasks: install.yml + tags: always + +- include_tasks: write_version.yml + tags: always + +- include_tasks: cleanup.yml + tags: always + diff --git a/roles/consul_cni/tasks/write_version.yml b/roles/consul_cni/tasks/write_version.yml new file mode 100644 index 0000000..c35414e --- /dev/null +++ b/roles/consul_cni/tasks/write_version.yml @@ -0,0 +1,5 @@ +--- + +- name: Write installed version + copy: content={{ consul_cni_version }} dest={{ consul_cni_root_dir }}/meta/consul_cni_version + tags: cni diff --git a/roles/consul_template/defaults/main.yml b/roles/consul_template/defaults/main.yml index f802a0f..b118cf5 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.37.6 +consul_tpl_version: 0.38.1 # 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: b28c97b954cdc04f8793ea233614054f39a30e6d81a6e957ed1c6bc864369f50 +consul_tpl_archive_sha256: 0014faa80000b767802643c34689852a3de80616dac4770a765d0073bb44a892 # Root dir where consul-template will be installed consul_tpl_root_dir: /opt/consul_template diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml index 015c374..43e17d7 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.17.0' +kimai_version: '2.18.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: 354a308c513f0bf0296b5acd15733a14940657f7ee0c460c721ce7e3a168cd52 +kimai_archive_sha256: e6a0982470665c6b08c25117b0da621f1ad0ce5cc9a3f07c4e63361a38b9cd56 # Directory where kimai will be installed kimai_root_dir: /opt/kimai_{{ kimai_id }} # Should ansible handle upgrades or only initial install diff --git a/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 b/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 index 5288e6c..17858e8 100644 --- a/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 +++ b/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 @@ -15,6 +15,7 @@ WorkingDirectory=/usr/share/lemonldap-ng/llng-server ExecStart=/usr/sbin/uwsgi \ --plugin psgi \ --psgi llng-server.psgi \ + --perl-no-die-catch \ --plugin systemd_logger \ --logger systemd \ --socket /run/llng-uwsgi/llng-uwsgi.sock \ diff --git a/roles/n8n/defaults/main.yml b/roles/n8n/defaults/main.yml index 7a43909..0867f80 100644 --- a/roles/n8n/defaults/main.yml +++ b/roles/n8n/defaults/main.yml @@ -1,7 +1,7 @@ --- # Version to deploy -n8n_version: 1.42.1 +n8n_version: 1.44.1 # Root directory where n8n will be installed n8n_root_dir: /opt/n8n # User account under which n8n will run diff --git a/roles/nomad/meta/main.yml b/roles/nomad/meta/main.yml index 5c4aae8..e645ea3 100644 --- a/roles/nomad/meta/main.yml +++ b/roles/nomad/meta/main.yml @@ -6,5 +6,5 @@ dependencies: when: nomad_conf.client.enabled and nomad_conf.client.task_drivers['containerd-driver'].enabled # with containerd, we need docker repo to install containerd.io - role: docker when: nomad_conf.client.enabled and nomad_conf.client.task_drivers.docker.enabled - - role: cni_plugins + - role: consul_cni when: nomad_conf.client.enabled diff --git a/roles/odoo/templates/odoo-server.service.j2 b/roles/odoo/templates/odoo-server.service.j2 index 3a0e7be..061fb64 100644 --- a/roles/odoo/templates/odoo-server.service.j2 +++ b/roles/odoo/templates/odoo-server.service.j2 @@ -6,6 +6,7 @@ After=network.service Type=simple User={{ odoo_user }} Group={{ odoo_user }} +Environment=PYTHONPATH={{ odoo_root_dir }}/app ExecStart={{ odoo_root_dir }}/venv/bin/python3 {{ odoo_root_dir }}/app/setup/odoo -c {{ odoo_root_dir }}/etc/odoo-server.conf --proxy-mode{% if not odoo_db_manager %} --no-database-list{% endif %} PrivateTmp=yes diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains index 2caf059..e6f6e8f 100644 --- a/roles/squid/files/acl/software_various.domains +++ b/roles/squid/files/acl/software_various.domains @@ -17,6 +17,7 @@ www.internic.net tzurl.org gitlab.com archive.apache.org +downloads.apache.org www.apache.org dlcdn.apache.org ftp.gnu.org