Used ucf for installing/updating nagvis' apache.conf

git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1213 98d490a6-b407-0410-aaaa-fdee166ba3f5

diff --git a/debian/changelog b/debian/changelog
index fe7b25dc8232d24fe7db08ad89821759acd225ad..9a25dafefd66984dbb57c73722b6b37af5f994e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nagvis (1.1rc3-2) unstable; urgency=low
 
   * Moved from misc to net section
   * Removed unneeded stuff in debian/rules
+  * Installed apache.conf with ucf 
 
  -- Hendrik Frenzel <hfrenzel@scunc.net>  Tue, 28 Aug 2007 21:09:01 +0200
 

diff --git a/debian/examples b/debian/examples
index f7d4e5eddb2d3a311be5f4c822b98455b504f6e8..fa0fd9bfe668b82142906dd1eebc032151fe028b 100644 (file)
--- a/debian/examples
+++ b/debian/examples
@@ -1,4 +1,3 @@
 dist/class.GlobalBackend-html.php
 dist/class.GlobalBackend-html.readme
 debian/tmp/demo
-debian/apache.conf

diff --git a/debian/postinst b/debian/postinst
index 31e91d20af82d0f6ba5378ec1785d163e92ae9f1..924f94b48b31524154817db2fecfe729f5239b6f 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -38,6 +38,8 @@ setperm() { # thx 2 nagios2/debian/nagios2-common.postinst
                chown "$user":"$group" "$file"
                chmod "$mode" "$file"
        fi
+
+               
 }
 
 case "$1" in
@@ -48,6 +50,8 @@ case "$1" in
        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)

diff --git a/debian/rules b/debian/rules
index 1590cd1b0268eeba6600f4283c744e0278090a40..4ed878188c7577251fce8eccfd2c6ac058c7e7a5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,10 @@ install: build
        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