[Pkg-voip-commits] r3703 - in freepbx/trunk/debian: . share

[elcuco-guest at alioth.debian.org]

Author: elcuco-guest
Date: 2007-07-02 09:40:06 +0000 (Mon, 02 Jul 2007)
New Revision: 3703

Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/share/update-freepbx
Log:
another fix by Dermot Bradley, now the update-freepbx script was broken which created a faulty op-panel configuration.



Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-07-01 15:02:36 UTC (rev 3702)
+++ freepbx/trunk/debian/changelog	2007-07-02 09:40:06 UTC (rev 3703)
@@ -8,6 +8,7 @@
 
   [ Dermot Bradley ]
   * Fixed fix-agibin-dir: log path was wrong
+  * Fixed op-panel configuration generation (problem in update-freepbx)
 
  -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Tue, 26 Jun 2007 14:25:11 +0300
 

Modified: freepbx/trunk/debian/share/update-freepbx
===================================================================
--- freepbx/trunk/debian/share/update-freepbx	2007-07-01 15:02:36 UTC (rev 3702)
+++ freepbx/trunk/debian/share/update-freepbx	2007-07-02 09:40:06 UTC (rev 3703)
@@ -76,12 +76,12 @@
 
 if [ -e /etc/op-panel/freepbx/op_server.cfg ] ; then
 	echo -n " - Updating op-panel"
-	sed -n -r -i "s/manager_user=[a-zA-Z0-9]*/manager_user=$AMPMGRUSER/"			/etc/op-panel/freepbx/op_server.cfg
-	sed -n -r -i "s/manager_secret=[a-zA-Z0-9]*/manager_secret=$AMPMGRPASS/"		/etc/op-panel/freepbx/op_server.cfg
-	sed -n -r -i "s/web_hostname=[a-zA-Z0-9_.-]*/web_hostname=$AMPWEBADDRESS/"		/etc/op-panel/freepbx/op_server.cfg
-	sed -n -r -i "s/security_code=[a-zA-Z0-9]*/security_code=$FOPPASSWORD/"			/etc/op-panel/freepbx/op_server.cfg
-	sed -n -r -i "s!flash_dir=[a-zA-Z0-9_./\-]*!flash_dir=/usr/share/op-panel/flash!"	/etc/op-panel/freepbx/op_server.cfg
-	sed -n -r -i "s!web_hostname=[a-zA-Z0-9.]*!web_hostname=$AMPWEBADDRESS!"		/etc/op-panel/freepbx/op_server.cfg
+	sed -r -i "s/manager_user=[a-zA-Z0-9]*/manager_user=$AMPMGRUSER/"			/etc/op-panel/freepbx/op_server.cfg
+	sed -r -i "s/manager_secret=[a-zA-Z0-9]*/manager_secret=$AMPMGRPASS/"		/etc/op-panel/freepbx/op_server.cfg
+	sed -r -i "s/web_hostname=[a-zA-Z0-9_.-]*/web_hostname=$AMPWEBADDRESS/"		/etc/op-panel/freepbx/op_server.cfg
+	sed -r -i "s/security_code=[a-zA-Z0-9]*/security_code=$FOPPASSWORD/"			/etc/op-panel/freepbx/op_server.cfg
+	sed -r -i "s!flash_dir=[a-zA-Z0-9_./\-]*!flash_dir=/usr/share/op-panel/flash!"	/etc/op-panel/freepbx/op_server.cfg
+	sed -r -i "s!web_hostname=[a-zA-Z0-9.]*!web_hostname=$AMPWEBADDRESS!"		/etc/op-panel/freepbx/op_server.cfg
 	echo "."
 	
 	# we might find situations in which there is no file operator panel installed