[checkmk-commits] Check_MK Git: check_mk: FIX setup. py now handles non existing wwwuser gracefully

Module: check_mk Branch: master Commit: 5c1697fac55b856040786f2487903e88d935ae61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c1697fac55b85… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 10:57:25 2013 +0100 FIX setup.py now handles non existing wwwuser gracefully --- .werks/41 | 8 ++++++++ ChangeLog | 3 +++ scripts/setup.sh | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/41 b/.werks/41 new file mode 100644 index 0000000..d558bc3 --- /dev/null +++ b/.werks/41 @@ -0,0 +1,8 @@ +Title: setup.py now handles non existing wwwuser gracefully +Level: 1 +Component: core +Version: 1.2.3i6 +Date: 1383213401 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5d18336..874ad66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i6: + Core & Setup: + * FIX 0041: setup.py now handles non existing wwwuser gracefully... + Checks & Agents: * 0040: Add agent plugin to test local hostname resolving... * FIX 0020: Inventory problem with inventory_processes parameter... diff --git a/scripts/setup.sh b/scripts/setup.sh index 054c838..ae5f238 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1006,8 +1006,8 @@ EOF # WATO. Also create an empty and Apache-writable auth.serials serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && touch "$serials_file" && - chown $wwwuser "$serials_file" && - chown $wwwuser "$htpasswd_file" && + (chown $wwwuser "$serials_file" || true) && + (chown $wwwuser "$htpasswd_file" || true) && create_sudo_configuration && if [ "$enable_mkeventd" = yes ] then