[checkmk-commits] Check_MK Git: check_mk: setup.sh: fix tmp paths on OMD

Module: check_mk Branch: master Commit: 75933e956d2f6e2beac6901531b5c6eb1150252a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75933e956d2f6e… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Mar 3 16:16:41 2011 +0100 setup.sh: fix tmp paths on OMD --- .bugs/174 | 10 +++++++--- ChangeLog | 4 ++++ scripts/setup.sh | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.bugs/174 b/.bugs/174 index c0fa054..24870b5 100644 --- a/.bugs/174 +++ b/.bugs/174 @@ -1,10 +1,14 @@ Title: local installation on OMD uses invalid cache path Component: core +State: done +Class: bug +Date: 2011-03-03 09:06:58 Benefit: 1 -State: open Cost: 1 -Date: 2011-03-03 09:06:58 -Class: bug +Fun: 0 If you install Check_MK locally in OMD, the cache path is var/check_mk/cache, but should be tmp/check_mk/cache. + +2011-03-03 16:16:28: changed state open -> done +Now counters and cache are in tmp/check_mk. diff --git a/ChangeLog b/ChangeLog index 88b7603..6d808d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 1.1.10b2: + Core, Setup, etc.: + * FIX: setup.sh on OMD: fix paths for cache and counters + WATO: * FIX: Fixed bug that lost autochecks when using WATO and cmk -II together + 1.1.10b1: Core, Setup, etc.: * FIX: do not assume 127.0.0.1 as IP address for usewalk_hosts if diff --git a/scripts/setup.sh b/scripts/setup.sh index 91aa587..06265b1 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -445,6 +445,7 @@ fi create_defaults () { + cat <<EOF # This file has been created during setup of check_mk at $(date). # Do not edit this file. Also do not try to override these settings @@ -501,6 +502,8 @@ cat <<EOF # Special for OMD omd_site = '$OMD_SITE' omd_root = '$OMD_ROOT' +tcp_cache_dir = '$OMD_ROOT/tmp/check_mk/cache' +counters_directory = '$OMD_ROOT/tmp/check_mk/counters' EOF fi }