[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.9.1-1-7-ga387ff5

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 940f7de5c42217a3060077ef195c98af4868effc
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Jul 3 07:26:04 2013 +0200

    Move apache config to /usr/share

diff --git a/debian/icinga-cgi.install b/debian/icinga-cgi.install
index b8658a8..2579bd7 100644
--- a/debian/icinga-cgi.install
+++ b/debian/icinga-cgi.install
@@ -8,3 +8,4 @@ usr/share/icinga/htdocs/js/*
 usr/share/icinga/htdocs/media
 usr/share/icinga/htdocs/robots.txt
 usr/share/icinga/htdocs/stylesheets/* /etc/icinga/stylesheets/
+debian/apache2.conf /usr/share/icinga
diff --git a/debian/icinga-cgi.postinst b/debian/icinga-cgi.postinst
index 34cd4e7..dc15b1e 100644
--- a/debian/icinga-cgi.postinst
+++ b/debian/icinga-cgi.postinst
@@ -59,7 +59,7 @@ case "$1" in
 	done
 
 
-	ucf --debconf-ok /usr/share/doc/icinga-cgi/examples/apache2.conf $apacheconf
+	ucf --debconf-ok /usr/share/icinga/apache2.conf $apacheconf
 
 	# configure the web servers, if it is desired
 	if [ "$servers" ]; then

-- 
debian packaging of icinga(-core)