[Pkg-voip-commits] r6339 - in /freepbx/trunk/debian: changelog freepbx-common.postinst

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Wed Oct 29 13:36:58 2008
New Revision: 6339

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6339
Log:
debian/freepbx-common.postinst: Fixed inconsistent whitespace.

Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/freepbx-common.postinst

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=6339&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Wed Oct 29 13:36:58 2008
@@ -12,10 +12,12 @@
   * debian/control: Removed php4 packages from Depends, as php4 is no longer
     distributed as part of unstable.
   * debian/freepbx-panel.postinst: Fixed deprecated use of chown.
-  * debian/freepbx-common.postinst: Removed php4-specific code, as php4 is no
-    longer distributed as part of unstable.
-
- -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Fri, 24 Oct 2008 13:56:32 +0100
+  * debian/freepbx-common.postinst:
+    + Removed php4-specific code, as php4 is no longer distributed as part of
+      unstable.
+    + Fixed inconsistent whitespace.
+
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Fri, 24 Oct 2008 14:08:51 +0100
 
 freepbx (2.3.1~dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/freepbx-common.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-common.postinst?rev=6339&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-common.postinst (original)
+++ freepbx/trunk/debian/freepbx-common.postinst Wed Oct 29 13:36:58 2008
@@ -36,7 +36,7 @@
 	cp /usr/share/freepbx-common/amportal.conf /etc/amportal.conf
 
 	# create random passwords for manager and sql
-        RAND_PASS=`dd if=/dev/urandom count=20 2>/dev/null | md5sum | awk '{print $1}'` &&
+	RAND_PASS=`dd if=/dev/urandom count=20 2>/dev/null | md5sum | awk '{print $1}'` &&
 		sed -r -i "s/AMPDBPASS=[a-zA-Z0-9]*/AMPDBPASS=$RAND_PASS/" /etc/amportal.conf
 	RAND_PASS=`dd if=/dev/urandom count=20 2>/dev/null | md5sum | awk '{print $1}'` &&
 		sed -r -i "s/AMPMGRPASS=[a-zA-Z0-9]*/AMPMGRPASS=$RAND_PASS/" /etc/amportal.conf
@@ -53,7 +53,7 @@
 
 	# if it works, enable the core module
 	# TODO: is this needed? the default install does not enable the core module?
-        /usr/share/asterisk/bin/module_admin install core || echo "Continuing anyway"
+	/usr/share/asterisk/bin/module_admin install core || echo "Continuing anyway"
 }
 
 issue_upgrade()
@@ -74,14 +74,12 @@
 		# this may fail for so many reasons... let the user do it himself 
 		# after the package has been installed
 		# TODO: use debconf. Debian policy says echo is bad
-		echo \
-"Upgrade failed, continuing anyway. Fix your system and execute:
-	/usr/share/freepbx-common/install_amp --no-files
-	
-You may want also to enable the code module using this command 
-(this can be done from the GUI as well):
-	/usr/share/asterisk/bin/module_admin install core
-"
+		echo "Upgrade failed, continuing anyway. Fix your system and execute:"
+		echo "    /usr/share/freepbx-common/install_amp --no-files"
+		echo "You may want also to enable the code module using this command"
+		echo "(this can be done from the GUI as well):"
+		echo "    /usr/share/asterisk/bin/module_admin install core"
+
 	fi
 }
 
@@ -125,21 +123,21 @@
 		# TODO: fill this list using 'apt-cache show httpd-cgi'
 		WEBSERVERS="apache apache2 mathopd lighttpd"
 		
-    	        # on fresh installs, we need to modify the www-data user this 
+		# on fresh installs, we need to modify the www-data user this 
 		# might be already done by other packages, or a previous version
-	        # of this package. 
-    		if groups www-data | grep -q -w -v asterisk ; then
-	                echo -n "Changing permissions of the web server"
-				adduser www-data asterisk
-            		echo "."
+		# of this package. 
+		if groups www-data | grep -q -w -v asterisk ; then
+			echo -n "Changing permissions of the web server"
+			adduser www-data asterisk
+			echo "."
 
 			# TODO - there must be a generic way of doying this stuff
-    		        echo "Restarting the httpd server to take usage of the new ownership"
+			echo "Restarting the httpd server to take usage of the new ownership"
 			HTTPD_ACTION=restart
 		else
 			# on upgrades, reloading apache(s) is enough
 			HTTPD_ACTION=reload
-	        fi
+		fi
 
 		for i in $WEBSERVERS; do
 			if test -x /etc/init.d/$i; then