[Pkg-nagios-changes] [pkg-nagios] r1213 - nagvis/trunk/debian

[Hendrik Frenzel]

Author: hfrenzel-guest
Date: 2007-08-28 20:38:17 +0000 (Tue, 28 Aug 2007)
New Revision: 1213

Modified:
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/examples
   nagvis/trunk/debian/postinst
   nagvis/trunk/debian/rules
Log:
Used ucf for installing/updating nagvis' apache.conf


Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2007-08-28 19:22:55 UTC (rev 1212)
+++ nagvis/trunk/debian/changelog	2007-08-28 20:38:17 UTC (rev 1213)
@@ -2,6 +2,7 @@
 
   * Moved from misc to net section
   * Removed unneeded stuff in debian/rules
+  * Installed apache.conf with ucf 
 
  -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 28 Aug 2007 21:09:01 +0200
 

Modified: nagvis/trunk/debian/examples
===================================================================
--- nagvis/trunk/debian/examples	2007-08-28 19:22:55 UTC (rev 1212)
+++ nagvis/trunk/debian/examples	2007-08-28 20:38:17 UTC (rev 1213)
@@ -1,4 +1,3 @@
 dist/class.GlobalBackend-html.php
 dist/class.GlobalBackend-html.readme
 debian/tmp/demo
-debian/apache.conf

Modified: nagvis/trunk/debian/postinst
===================================================================
--- nagvis/trunk/debian/postinst	2007-08-28 19:22:55 UTC (rev 1212)
+++ nagvis/trunk/debian/postinst	2007-08-28 20:38:17 UTC (rev 1213)
@@ -38,6 +38,8 @@
 		chown "$user":"$group" "$file"
 		chmod "$mode" "$file"
 	fi
+
+		
 }
 
 case "$1" in
@@ -48,6 +50,8 @@
 	done
 	setperm www-data www-data 0775 /usr/share/nagvis/htdocs/nagvis/images/maps
 	setperm www-data www-data 0775 /usr/share/nagvis/htdocs/nagvis/etc/maps
+
+	ucf /usr/share/nagvis/debian/apache.conf /etc/nagvis/apache.conf
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2007-08-28 19:22:55 UTC (rev 1212)
+++ nagvis/trunk/debian/rules	2007-08-28 20:38:17 UTC (rev 1213)
@@ -64,6 +64,10 @@
 	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/maps/nagvis-demo.png \
 		$(DEST)/demo/nagvis/images/maps/
 	
+	# config templates
+	mkdir -p $(DEST)/usr/share/nagvis/debian
+	cp debian/apache.conf $(DEST)/usr/share/nagvis/debian/
+	
 	dh_installdirs
 	dh_install
 	dh_link