fix web package

diff --git a/debian/check-mk-server-common.dirs b/debian/check-mk-server-common.dirs
index 9ffdbeb64726ba45333c4a637432f410d72eaedf..ed24ece6392355b7af34c6bdddfcfc67b1495c38 100644 (file)
--- a/debian/check-mk-server-common.dirs
+++ b/debian/check-mk-server-common.dirs
@@ -1 +1,2 @@
 etc/check_mk/conf.d
+var/lib/check_mk

diff --git a/debian/check-mk-server-common.install b/debian/check-mk-server-common.install
index 40e9c0b3340799043eb81f25414633cce30abc5f..dd0b09f46bf2fb99e8d8e3c123927f116a287108 100644 (file)
--- a/debian/check-mk-server-common.install
+++ b/debian/check-mk-server-common.install
@@ -1,6 +1,6 @@
 etc/check_mk/main.mk
 etc/check_mk/conf.d/README
-var/lib/check_mk
+var/lib/check_mk/{autochecks,cache,counters,logwatch,packages,precompiled,rrd}
 usr/bin/check_mk
 usr/share/doc/check_mk/check_mk_templates.cfg
 usr/share/check_mk/modules

diff --git a/debian/check-mk-web.dirs b/debian/check-mk-web.dirs
new file mode 100644 (file)
index 0000000..0376e88
--- /dev/null
+++ b/debian/check-mk-web.dirs
@@ -0,0 +1,2 @@
+etc/check_mk
+var/lib/check_mk/

diff --git a/debian/check-mk-web.install b/debian/check-mk-web.install
index d9c47668d89422a8aed43db1c2444606729d11ee..c1229038c300c7e6a696c072cd32abf87ad18448 100644 (file)
--- a/debian/check-mk-web.install
+++ b/debian/check-mk-web.install
@@ -1,3 +1,4 @@
 usr/share/check_mk/web
-usr/share/check_mk/web/htdocs/* usr/share/icinga/htdocs
 etc/apache2/conf.d/zzz_check_mk.conf
+etc/check_mk/multisite.mk
+var/lib/check_mk/web

diff --git a/debian/check-mk-web.postinst b/debian/check-mk-web.postinst
new file mode 100644 (file)
index 0000000..a1aa1b3
--- /dev/null
+++ b/debian/check-mk-web.postinst
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+setperm() {
+    local user="$1"
+    local group="$2"
+    local mode="$3"
+    local file="$4"
+    shift 4
+    # only do something when no setting exists
+    if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+        chown "$user":"$group" "$file"
+        chmod "$mode" "$file"
+    fi
+}
+
+case "$1" in
+    configure)
+        # explicitly set permissions on some files
+        setperm www-data www-data 770 /var/lib/check_mk/web
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+    *)
+        echo "postinst called with unknown argument \$1'" >&2
+        exit 1
+    ;;
+esac
+

diff --git a/debian/control b/debian/control
index 4769d989a02c0afc0075937f584eee53c20958dd..2e85884be90a75ce6eb129b07d2d58e72d5b6fbf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -76,8 +76,8 @@ Description: general purpose nagios-plugin for retrieving data
 
 Package: check-mk-web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: xinetd
+Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-python
+Suggests: check-mk-livestatus
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems
  and network components. It obsoletes NRPE, check_by_ssh, NSClient and
@@ -86,4 +86,5 @@ Description: general purpose nagios-plugin for retrieving data
   * Significant reduction of CPU usage on the Nagios host.
   * Automatic inventory of items to be checked on hosts. 
  .
- This package contains the webfrontend to check_mk
+ This package contains the webfrontend of check_mk also known as
+ "MK-Multisite"

diff --git a/debian/rules b/debian/rules
index c31d733bccbe106f5d5ec2598078c9b3ce0c2751..ca6a998e7a440252a51debe156abfc1f8a04a6db 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,9 @@ install: build
        dh_prep 
        dh_installdirs
        mkdir -p debian/tmp
-       DESTDIR=debian/tmp ./setup.sh --yes
+       DESTDIR=debian/tmp \
+               livesock=/var/lib/nagios3/rw/live \
+               ./setup.sh --yes
        cp -a livestatus.src/debian/tmp/* debian/tmp/
        rm debian/tmp/usr/share/check_mk/modules/defaults
        mkdir -p debian/check-mk-server-icinga/usr/share/check_mk/modules/