From 1f83a5a24e58bee1a49812f768038420d0023168 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 8 Mar 2023 21:00:12 +0100 Subject: [PATCH] Update to 2023-03-08 21:00 --- roles/consul/defaults/main.yml | 4 ++-- roles/httpd_php/handlers/main.yml | 3 +++ roles/kimai/defaults/main.yml | 4 ++-- roles/nomad/tasks/directories.yml | 1 + roles/nomad/tasks/facts.yml | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml index 40a5f5f..35b4b53 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.0 +consul_version: 1.15.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: 62a358ff2c3c08d19f15a92ea3130b05b547ab5a767ae13454eab7655a718c24 +consul_archive_sha256: 23f7eb0461dd01a95c5d56472b91c22d5dacec84f31f1846c0c9f9621f98f29f # user account under which consul will run (will be created if needed) consul_user: consul diff --git a/roles/httpd_php/handlers/main.yml b/roles/httpd_php/handlers/main.yml index 462e2d8..eafc3e4 100644 --- a/roles/httpd_php/handlers/main.yml +++ b/roles/httpd_php/handlers/main.yml @@ -13,4 +13,7 @@ service: name=php{{ item }}-php-fpm state=started enabled=True with_items: "{{ httpd_php_versions }}" +- name: systemd-tmpfiles + command: systemd-tmpfiles --create + ... diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml index afcccd7..b495732 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.30.10' +kimai_version: '1.30.11' # 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: 9299fe7cf1378a66e2fa6ae5a809529d457dd8a5b3f5caba0759fef3a07247a0 +kimai_archive_sha256: 0800ed6321bb5ec1e3fbd984a1b44b5d6adb92ca16475a7194f4d6835139f30b # Directory where kimai will be installed kimai_root_dir: /opt/kimai_{{ kimai_id }} diff --git a/roles/nomad/tasks/directories.yml b/roles/nomad/tasks/directories.yml index 1094b8a..0741a0a 100644 --- a/roles/nomad/tasks/directories.yml +++ b/roles/nomad/tasks/directories.yml @@ -26,6 +26,7 @@ - dir: data owner: "{{ nomad_user }}" group: "{{ nomad_user }}" + mode: 700 - dir: plugins owner: "{{ nomad_user }}" group: "{{ nomad_user }}" diff --git a/roles/nomad/tasks/facts.yml b/roles/nomad/tasks/facts.yml index 295dbe3..594843d 100644 --- a/roles/nomad/tasks/facts.yml +++ b/roles/nomad/tasks/facts.yml @@ -24,7 +24,7 @@ - when: nomad_bin.stat.exists block: - name: Detect installed version - shell: /usr/local/bin/nomad version | perl -pe 's/Nomad v(\d+(\.\d+)*)\s.*/$1/' + shell: /usr/local/bin/nomad version | perl -ne '/Nomad v(\d+(\.\d+)*)\s.*/ && print "$1\n"' changed_when: False register: nomad_current_version - set_fact: nomad_current_version={{ nomad_current_version.stdout }}