[checkmk-commits] Check_MK Git: check_mk: FIX: add missing $DESTDIR to auth.serials in setup. sh

Module: check_mk Branch: master Commit: 61a6de0f659536d74bceb535a8eccc4633964c59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61a6de0f659536… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 10:39:26 2013 +0200 FIX: add missing $DESTDIR to auth.serials in setup.sh Conflicts: ChangeLog --- ChangeLog | 4 ++++ scripts/setup.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4c22169..1e62fb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -401,6 +401,10 @@ 1.2.2p3: Core: * FIX: get_average(): Gracefully handle time anomlies of target systems + * FIX: notifications: /var/lib/check_mk/notify directory is now created + correctly during setup from tgz file. (Without it notifications + did not get sent out.) + * FIX: add missing $DESTDIR to auth.serials in setup.sh Checks & Agents: * FIX: winperf_processor: fix case where CPU percent is exactly 100% diff --git a/scripts/setup.sh b/scripts/setup.sh index 9d5e274..71ace8a 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1004,7 +1004,7 @@ EOF done && # make htpasswd writable by apache, since we need this for # WATO. Also create an empty and Apache-writable auth.serials - serials_file=${htpasswd_file%/*}/auth.serials && + serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && touch "$serials_file" && chown $wwwuser "$serials_file" && chown $wwwuser "$htpasswd_file" &&