From f5f4a82114adc80c20ab31902e09fa547e6e01ba Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 21 Aug 2019 15:40:10 +0200 Subject: [PATCH] evomaintenance: upstream version 0.5.1 --- CHANGELOG.md | 1 + evomaintenance/files/evomaintenance.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb027736..6c8d6f06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The **patch** part changes incrementally at each release. * elasticsearch: listen on local interface only by default * squid: Remove wait time when we turn off squid * evomaintenance: Turn on API by default (instead of DB) +* evomaintenance: upstream version 0.5.1 ### Fixed * lxc-php: Don't remove the default pool diff --git a/evomaintenance/files/evomaintenance.sh b/evomaintenance/files/evomaintenance.sh index 40b36625..4820f49a 100644 --- a/evomaintenance/files/evomaintenance.sh +++ b/evomaintenance/files/evomaintenance.sh @@ -4,11 +4,11 @@ # Dependencies (all OS): git postgresql-client # Dependencies (Debian): sudo -# version 0.5.0 +# version 0.5.1 # Copyright 2007-2019 Evolix , Gregory Colpart , # Jérémy Lecour and others. -VERSION="0.5.0" +VERSION="0.5.1" show_version() { cat <&1 fi GIT_BIN=$(command -v git) readonly GIT_BIN -if [ -z "${GIT_BIN}" ]; then +if [ "${HOOK_COMMIT}" = "1" ] && [ -z "${GIT_BIN}" ]; then echo "No \`git' command has been found, can't commit changes" 2>&1 fi PSQL_BIN=$(command -v psql) readonly PSQL_BIN -if [ -z "${PSQL_BIN}" ]; then +if [ "${HOOK_DB}" = "1" ] && [ -z "${PSQL_BIN}" ]; then echo "No \`psql' command has been found, can't save to the database." 2>&1 fi CURL_BIN=$(command -v curl) readonly CURL_BIN -if [ -z "${CURL_BIN}" ]; then +if [ "${HOOK_API}" = "1" ] && [ -z "${CURL_BIN}" ]; then echo "No \`curl' command has been found, can't call the API." 2>&1 fi -if [ -z "${API_ENDPOINT}" ]; then +if [ "${HOOK_API}" = "1" ] && [ -z "${API_ENDPOINT}" ]; then echo "No API endpoint specified, can't call the API." 2>&1 fi