diff --git a/check_apache_requests b/check_apache_requests index ce7b506a73fca66ca1c2e5d297b65b5ff29b936f..7e74157f3aaff2f34dd471dc303d9932f7af8978 100755 --- a/check_apache_requests +++ b/check_apache_requests @@ -13,13 +13,13 @@ # 2022-08-31 v1.4 <axel.hahn@iml.unibe.ch> add help; shellfix corrections # 2023-06-19 v1.5 <axel.hahn@unibe.ch> no more tmpfile # 2023-07-27 v1.6 <axel.hahn@unibe.ch> update help page -# 2025-02-10 v1.3 <axel.hahn@unibe.ch> harden sourcing files +# 2025-02-10 v1.7 <axel.hahn@unibe.ch> harden sourcing files # ====================================================================== # shellcheck source=/dev/null . "$( dirname "$0" )/inc_pluginfunctions" || exit 1 -export self_APPVERSION=1.6 +export self_APPVERSION=1.7 # url=`hostname -f`/server-status url=localhost/server-status diff --git a/check_deployment b/check_deployment index 98c7ff5fa60f055051ad75a91463376403afdb40..f72c3fbb4748729b1910ad69068cdaee7e31e522 100755 --- a/check_deployment +++ b/check_deployment @@ -36,7 +36,7 @@ OPTIONS: default: ${sInstalldir} EXAMPLE: -$_self -d /home/deployuser/imlbackup +$_self -d /home/deployuser/imldeployment-installer set a custom directory und run the backup check EOF diff --git a/inc_haproxy_cfg.sh b/inc_haproxy_cfg.sh index d497baa4d1952207fb4734c3b068cc07c38b7994..cc0f1b1bab09ceb0940815310e293ff85f122a40 100755 --- a/inc_haproxy_cfg.sh +++ b/inc_haproxy_cfg.sh @@ -9,6 +9,7 @@ # 2022-10-21 v1.1 <axel.hahn@unibe.ch> remove grep: warning: stray \ before white space # 2023-06-09 v1.2 <axel.hahn@unibe.ch> take first haproxy stats port on multiple binds # 2023-07-28 v1.3 <axel.hahn@unibe.ch> check existance of file $HAPROXYcfgfile +# 2025-02-20 v1.4 <axel.hahn@unibe.ch> cfgrewriter returns exitcode 0 - haproxy check do not abort when sourcing on non haproxy systems # ====================================================================== # full path to haproxy.cfg @@ -68,6 +69,7 @@ function cfgrewriter(){ echo $line | sed -e "s#^ *\([a-z\-]*\) *#\1=#g" fi done < $HAPROXYcfgfile + return 0 } # ------------------------------------------------------------ @@ -171,4 +173,4 @@ function getStatusUri(){ # INIT if [ $HAPROXYdoCache = 0 -o $HAPROXYcfgfile -nt $HAPROXYdumpfile ]; then cfgrewriter >$HAPROXYdumpfile -fi \ No newline at end of file +fi