From aceb4b022035c96c9cfcffbee4705471c558cbb1 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 3 Mar 2021 12:00:07 +0100 Subject: [PATCH] Update to 2021-03-03 12:00 --- roles/ampache/defaults/main.yml | 6 +++--- roles/appsmith/tasks/install.yml | 1 + roles/appsmith/templates/pre-start.sh.j2 | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/ampache/defaults/main.yml b/roles/ampache/defaults/main.yml index 2234a39..30157e6 100644 --- a/roles/ampache/defaults/main.yml +++ b/roles/ampache/defaults/main.yml @@ -3,10 +3,10 @@ ampache_id: "1" ampache_manage_upgrade: True -ampache_version: '4.3.0' -ampache_config_version: 46 +ampache_version: '4.4.0' +ampache_config_version: 49 ampache_zip_url: https://github.com/ampache/ampache/releases/download/{{ ampache_version }}/ampache-{{ ampache_version }}_all.zip -ampache_zip_sha1: d8ffee09a0dd45b68ac678fa1f043f63ff7a0949 +ampache_zip_sha1: 9884ca5099c8e87a8c9732334b309d53ed88a670 ampache_root_dir: /opt/ampache_{{ ampache_id }} diff --git a/roles/appsmith/tasks/install.yml b/roles/appsmith/tasks/install.yml index 98e3bd1..a75f5e1 100644 --- a/roles/appsmith/tasks/install.yml +++ b/roles/appsmith/tasks/install.yml @@ -128,6 +128,7 @@ - name: Install pre-start script template: src=pre-start.sh.j2 dest={{ appsmith_root_dir }}/bin/pre-start mode=755 + notify: restart appsmith-server tags: appsmith - name: Install pre/post backup hoooks diff --git a/roles/appsmith/templates/pre-start.sh.j2 b/roles/appsmith/templates/pre-start.sh.j2 index e671c4e..47bc1c4 100644 --- a/roles/appsmith/templates/pre-start.sh.j2 +++ b/roles/appsmith/templates/pre-start.sh.j2 @@ -1,7 +1,7 @@ #!/bin/bash -e -# If the conf changed since the last client deployement, then re-deploy -if [ {{ appsmith_root_dir }}/etc/env -nt {{ appsmith_root_dir }}/client/ ]; then +# If the conf changed since the last client deployement, or if the client build is newer than the one deployed, then re-deploy +if [ {{ appsmith_root_dir }}/etc/env -nt {{ appsmith_root_dir }}/client/ -o {{ appsmith_root_dir }}/src/app/client/build/ -nt {{ appsmith_root_dir }}/client/ ]; then rsync -a --delete {{ appsmith_root_dir }}/src/app/client/build/ {{ appsmith_root_dir }}/client/ find {{ appsmith_root_dir }}/client/ -type f | xargs \ sed -i \