[Pkg-nagios-changes] [SCM] Packaging of check_mk branch, master, updated. b1089831d7c975a0cc782a3c5e6f72f3bcb69ff0

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 27bc9920b922f841376b4ac275cfde4e104315ef
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Mar 6 18:22:33 2011 +0100

    Install multisite config in the config packages and fix username

diff --git a/debian/check-mk-config-icinga.install b/debian/check-mk-config-icinga.install
index 42d7836..f507c7b 100644
--- a/debian/check-mk-config-icinga.install
+++ b/debian/check-mk-config-icinga.install
@@ -1 +1,2 @@
 usr/share/doc/check_mk/check_mk_templates.cfg etc/icinga/objects
+etc/check_mk/multisite.mk
diff --git a/debian/check-mk-config-nagios3.install b/debian/check-mk-config-nagios3.install
index 42d7836..f507c7b 100644
--- a/debian/check-mk-config-nagios3.install
+++ b/debian/check-mk-config-nagios3.install
@@ -1 +1,2 @@
 usr/share/doc/check_mk/check_mk_templates.cfg etc/icinga/objects
+etc/check_mk/multisite.mk
diff --git a/debian/check-mk-multisite.install b/debian/check-mk-multisite.install
index f56323b..14ddd3f 100644
--- a/debian/check-mk-multisite.install
+++ b/debian/check-mk-multisite.install
@@ -1,3 +1,2 @@
 usr/share/check_mk/web
-etc/check_mk/multisite.mk
 var/lib/check_mk/web
diff --git a/debian/rules b/debian/rules
index cf4787a..53c0570 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,6 +100,7 @@ binary-arch: build install
 	dh_install
 	chmod +x debian/check-mk-server/usr/share/check_mk/checks/*
 	mv debian/check-mk-agent/etc/check_mk/logwatch.cfg debian/check-mk-agent/usr/share/doc/check-mk-agent/examples/
+	sed -i -e 's/nagiosadmin/icingaadmin/g' debian/check-mk-config-nagios3/etc/check_mk/multisite.mk
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate

-- 
Packaging of check_mk