[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. 1.2.1-1-4-gb67f62d

[Alexander Wirt]

The following commit has been merged in the master branch:
commit b67f62dac2571ffe834b2efb65e956ccecf63590
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Mar 30 22:17:36 2011 +0200

    Add missing 1.3.0 stuff

diff --git a/debian/changelog b/debian/changelog
index 90cf6c6..f3aad86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+icinga (1.3.0-1) unstable; urgency=low
+
+  * new upstream version 
+
+ -- Alexander Wirt <formorer at debian.org>  Sun, 13 Feb 2011 08:04:21 +0100
+
 icinga (1.2.1-2) unstable; urgency=low
 
   * Fix symlink to mootols 
diff --git a/debian/icinga-cgi.postinst b/debian/icinga-cgi.postinst
index ad1e5e5..34cd4e7 100644
--- a/debian/icinga-cgi.postinst
+++ b/debian/icinga-cgi.postinst
@@ -15,7 +15,7 @@ if [ -n "$ICINGADEBUG" ]; then
   set -x
 fi
 
-# location of the default apache configuration for nagios.
+# location of the default apache configuration for icinga
 apacheconf=$en/apache2.conf
 # location of the default htpasswd authentication file.
 htpw=$en/htpasswd.users
@@ -47,6 +47,18 @@ case "$1" in
 	db_get icinga/adminpassword
 	admpass="$RET"
 
+	unwanted_servers=""
+
+	#check which servers to uninclude
+	for s in $wc_httpd_supported
+	do
+		if ! echo $servers | grep -q $s
+		then
+			unwanted_servers="$s $unwanted_servers"
+		fi
+	done
+
+
 	ucf --debconf-ok /usr/share/doc/icinga-cgi/examples/apache2.conf $apacheconf
 
 	# configure the web servers, if it is desired
@@ -60,6 +72,19 @@ case "$1" in
 		fi	
 	fi
 
+	if [ "$unwanted_servers" ]; then
+		servers_to_deconf="$(wc_httpd_apache_configured $apacheconf icinga $unwanted_servers)"
+		if [ "$servers_to_deconf" ]; then
+			if wc_httpd_apache_uninclude $apacheconf icinga $servers_to_deconf; then
+				# reload the selected servers if they are running
+				running_servers="$(wc_httpd_running $unwanted_servers)"
+				if [ "$running_servers" ]; then
+					wc_httpd_invoke "reload" $running_servers
+				fi
+			fi
+		fi
+	fi
+
 
 	# we reset the password every run, so if it exists we're running
 	# after being specifically given a password and can unconditionally set it.
diff --git a/debian/patches/10_p1_pl_shebang.dpatch b/debian/patches/10_p1_pl_shebang.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/50_cgi.cfg-debianize.dpatch b/debian/patches/50_cgi.cfg-debianize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/51_commands.cfg-debianize.dpatch b/debian/patches/51_commands.cfg-debianize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/52_icinga.cfg-debianize.dpatch b/debian/patches/52_icinga.cfg-debianize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/55_idoutils-debianize.dpatch b/debian/patches/55_idoutils-debianize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch b/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/70_fix_eventhandler_paths.dpatch b/debian/patches/70_fix_eventhandler_paths.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/96_add_mootols_more.dpatch b/debian/patches/96_add_mootols_more.dpatch
old mode 100755
new mode 100644
diff --git a/debian/rules b/debian/rules
index 739ccdc..ea37cc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,13 +123,14 @@ install-stamp: build-stamp fix-configs-stamp
 	mv $b/icinga-idoutils/usr/sbin/idomod.o $b/icinga-idoutils/usr/lib/icinga/
 	cp module/idoutils/db/mysql/mysql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/mysql
 	cp module/idoutils/db/pgsql/pgsql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/pgsql
-	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2
-	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.3
-	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3
-	cp module/idoutils/db/mysql/mysql-upgrade-1.0.2-fix-object-relations.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2/02_mysql-upgrade-1.0.2-fix-object-relations.sql
-	cp module/idoutils/db/mysql/mysql-upgrade-1.0.2.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2/01_mysql-upgrade-1.0.2.sql
-	cp module/idoutils/db/mysql/mysql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.3/01_mysql-upgrade-1.0.3.sql
-	cp module/idoutils/db/pgsql/pgsql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3/01_pgsql-upgrade-1.0.3.sql
+	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/
+	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/
+	cp module/idoutils/db/mysql/mysql-upgrade-1.0.2-fix-object-relations.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-2
+	cp module/idoutils/db/mysql/mysql-upgrade-1.0.2.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-1
+	cp module/idoutils/db/mysql/mysql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.3-1.sql
+	cp module/idoutils/db/pgsql/pgsql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3-1.sql
+	cp module/idoutils/db/pgsql/pgsql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.3.0-1.sql
+	cp module/idoutils/db/mysql/mysql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.3.0-1.sql
 	# set up /var/cache/icinga for access by www-data
 	chgrp www-data ${b}/icinga-common/var/cache/icinga
 	chmod g+s ${b}/icinga-common/var/cache/icinga

-- 
debian packaging of icinga(-core)