diff --git a/roles/bookstack/defaults/main.yml b/roles/bookstack/defaults/main.yml index b2e362b..eaafb13 100644 --- a/roles/bookstack/defaults/main.yml +++ b/roles/bookstack/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to deploy -bookstack_version: '22.09' +bookstack_version: '22.09.1' # URL of the arhive bookstack_archive_url: https://github.com/BookStackApp/BookStack/archive/v{{ bookstack_version }}.tar.gz # Expected sha256 of the archive -bookstack_archive_sha256: 4807d646c2327f26d19df398e1f2ecc54d47a967eefbd80127c611fb1b1a9dbb +bookstack_archive_sha256: f66e8f0dad102997bb441bfcb8dcb8ab634ed4970623a6fbee4047399b21116a # Should ansible handle bookstack upgrades or just the inintial install bookstack_manage_upgrade: True diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml index 94d88d1..ed864ff 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.13.1 +consul_version: 1.13.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: 7f8f69b631114e0a021b602a1975e0221912b8b33ef20ead1589d6f6581c5579 +consul_archive_sha256: a72e88cbfec6c0fb3620cd58314ff0b42fc9d605a5192d6a568a417180f0b35f # user account under which consul will run (will be created if needed) consul_user: consul diff --git a/roles/consul/tasks/archive_pre.yml b/roles/consul/tasks/archive_pre.yml index e69a406..efe4e18 100644 --- a/roles/consul/tasks/archive_pre.yml +++ b/roles/consul/tasks/archive_pre.yml @@ -8,9 +8,11 @@ command: "{{ consul_root_dir }}/bin/consul snapshot save {{ consul_root_dir }}/archives/{{ consul_current_version }}/consul.snap" args: creates: "{{ consul_root_dir }}/archives/{{ consul_current_version }}/consul.snap" - when: consul_conf.server + when: + - consul_conf.server + - not consul_conf.acl.enabled or consul_mgm_token is defined environment: - CONSUL_TOKEN: "{{ consul_mgm_token | default(omit) }}" + CONSUL_TOKEN: "{{ consul_mgm_token | default('') }}" tags: consul - name: Backup previous version diff --git a/roles/consul/tasks/install.yml b/roles/consul/tasks/install.yml index f959e19..509c545 100644 --- a/roles/consul/tasks/install.yml +++ b/roles/consul/tasks/install.yml @@ -29,6 +29,7 @@ dest: "{{ consul_root_dir }}/bin/consul" remote_src: True mode: 755 + notify: restart consul - name: Link in /usr/local/bin file: src={{ consul_root_dir }}/bin/consul dest=/usr/local/bin/consul state=link force=True diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml index 43fb4b1..cafd227 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.24.0' +kimai_version: '1.25.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: 8b7f8b3b25b1cfee7e7ce3aedb01a02bc4301752f7a1d703053f553160884d68 +kimai_archive_sha256: af3f55d753345963cd88bdfd561d21cdc352efa746435124ee5441e764ad0b34 # Directory where kimai will be installed kimai_root_dir: /opt/kimai_{{ kimai_id }} diff --git a/roles/vault/tasks/install.yml b/roles/vault/tasks/install.yml index 505cd4a..f5d9e85 100644 --- a/roles/vault/tasks/install.yml +++ b/roles/vault/tasks/install.yml @@ -29,6 +29,7 @@ dest: "{{ vault_root_dir }}/bin/vault" remote_src: True mode: 755 + notify: restart vault - name: Link in /usr/local/bin file: src={{ vault_root_dir }}/bin/vault dest=/usr/local/bin/vault state=link force=True