c786f7e51a
revert back to last working version OBS-URL: https://build.opensuse.org/request/show/696159 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/check_mk?expand=0&rev=109
48 lines
2.5 KiB
Diff
48 lines
2.5 KiB
Diff
Index: setup.sh
|
|
===================================================================
|
|
--- setup.sh.orig
|
|
+++ setup.sh
|
|
@@ -1017,9 +1017,9 @@ EOF
|
|
# make htpasswd writable by apache, since we need this for
|
|
# WATO. Also create an empty and Apache-writable auth.serials
|
|
serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
|
|
- touch "$serials_file" &&
|
|
- (chown $wwwuser "$serials_file" || true) &&
|
|
- (chown $wwwuser "$htpasswd_file" || true) &&
|
|
+ #touch "$serials_file" &&
|
|
+ #(chown $wwwuser "$serials_file" || true) &&
|
|
+ #(chown $wwwuser "$htpasswd_file" || true) &&
|
|
create_sudo_configuration &&
|
|
if [ "$enable_mkeventd" = yes ]
|
|
then
|
|
@@ -1029,13 +1029,13 @@ EOF
|
|
then
|
|
pushd $SRCDIR/mkeventd.src > /dev/null &&
|
|
install -m 755 src/mkevent $DESTDIR$bindir &&
|
|
- install -m 4754 src/mkeventd_open514 -g $wwwgroup $DESTDIR$bindir &&
|
|
+ install -m 0754 src/mkeventd_open514 $DESTDIR$bindir &&
|
|
install -m 644 checks/* $DESTDIR$checksdir &&
|
|
install -m 755 bin/* $DESTDIR$bindir &&
|
|
install -m 755 lib/* $DESTDIR${check_icmp_path%/*} &&
|
|
cp -r web/* $DESTDIR$web_dir &&
|
|
mkdir -p $DESTDIR$confdir/mkeventd.d/wato &&
|
|
- chown $wwwuser.$wwwgroup $DESTDIR$confdir/mkeventd.d/wato &&
|
|
+ #chown $wwwuser.$wwwgroup $DESTDIR$confdir/mkeventd.d/wato &&
|
|
if [ ! -e "$DESTDIR$confdir/multisite.d/mkeventd.mk" ] ; then
|
|
mkdir -p $DESTDIR$confdir/multisite.d &&
|
|
echo 'mkeventd_enabled = True' > $DESTDIR$confdir/multisite.d/mkeventd.mk
|
|
@@ -1043,10 +1043,10 @@ EOF
|
|
touch $DESTDIR$confdir/mkeventd.mk &&
|
|
mkeventdsocketdir=${livesock%/*}/mkeventd &&
|
|
mkdir -p $DESTDIR$mkeventdsocketdir &&
|
|
- chown $nagiosuser.$wwwgroup $DESTDIR$mkeventdsocketdir &&
|
|
- chmod 2755 $DESTDIR$mkeventdsocketdir &&
|
|
+ #chown $nagiosuser.$wwwgroup $DESTDIR$mkeventdsocketdir &&
|
|
+ #chmod 2755 $DESTDIR$mkeventdsocketdir &&
|
|
mkdir -p $DESTDIR$mkeventdstatedir &&
|
|
- chown $nagiosuser $DESTDIR$mkeventdstatedir &&
|
|
+ #chown $nagiosuser $DESTDIR$mkeventdstatedir &&
|
|
create_mkeventd_startscript &&
|
|
popd > /dev/null
|
|
else
|