apache2-vhost-update: Show differences of vhost config being committed

diff --git a/apache2-vhost-update b/apache2-vhost-update
index 46643e80f8f3588e951307527215530f72ff76e2..5bddf71c3b196e6c19e8d8441bb02af91698d18d 100755 (executable)
--- a/apache2-vhost-update
+++ b/apache2-vhost-update
@@ -19,7 +19,7 @@
 # %apachectrl  ALL=(root)      /usr/sbin/apache2-vhost-update
 
 
 # %apachectrl  ALL=(root)      /usr/sbin/apache2-vhost-update
 
 

-# Copyright (c) 2009 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2009,2010 Peter Palfrader <peter@palfrader.org>

 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the


@@ -130,6 +130,9 @@ if [ "$?" != "0" ]; then
        exit 1
 fi
 
        exit 1
 fi
 

+echo "Differences:"
+rcsdiff -u "$DESTINATION/$site"
+

 echo "update run by $USER($SUDO_USER) at `date -R -u` on `hostname -f`" | \
        ci -u "$DESTINATION/$site"
 if [ "$?" != "0" ]; then
 echo "update run by $USER($SUDO_USER) at `date -R -u` on `hostname -f`" | \
        ci -u "$DESTINATION/$site"
 if [ "$?" != "0" ]; then

diff --git a/debian/changelog b/debian/changelog
index cfac9a1360c0ee688b888033144e2bd3d086fc3f..ec7390463900f7dace0e0ff0fcf3f40b20abaf71 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,9 @@ debian.org (30) UNRELEASED; urgency=low
     - libtimedate-perl
   * New dependencies of debian.org-recommended:
     - ftp
     - libtimedate-perl
   * New dependencies of debian.org-recommended:
     - ftp

+  * apache2-vhost-update: Show differences of vhost config being committed.

 
 

- -- Peter Palfrader <weasel@debian.org>  Sat, 23 Jan 2010 14:07:36 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 23 Jan 2010 17:26:50 +0100

 
 debian.org (29) stable; urgency=low
 
 
 debian.org (29) stable; urgency=low