[Pkg-voip-commits] r3503 - in freepbx/trunk/debian: . mysql patches sqlite3

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-04-30 11:40:34 +0000 (Mon, 30 Apr 2007)
New Revision: 3503

Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/mysql/install-sql
   freepbx/trunk/debian/patches/fix-agibin-dir.dpatch
   freepbx/trunk/debian/sqlite3/install-sql
Log:
  * freepbx-common: archive_recordings points to the correct php-asmanager.php (thanks
    to Robert Roach for reporting)
  * freepbx-sqlite, freepbx-mysql: install-sql scripts will also create a default route to the asterisk demos,
    fonud at the context "demos" (/etc/asterisk/extensions.d/demos.conf)




Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-04-30 05:00:27 UTC (rev 3502)
+++ freepbx/trunk/debian/changelog	2007-04-30 11:40:34 UTC (rev 3503)
@@ -17,6 +17,10 @@
     Now it is possible to install freepbx-sqlite3 in chroot
   * freepbx-common: agi/directory will store logs in the correct dir (fixes
     upstream 1912)
+  * freepbx-common: archive_recordings points to the correct php-asmanager.php (thanks 
+    to Robert Roach for reporting)
+  * freepbx-sqlite3, freepbx-mysql: create a default inbound route to the demos provided
+    in the asterisk documentation
 
   [ Chris Halls ]
   * Remove fix-recordings.patch - already fixed in a different way upstream

Modified: freepbx/trunk/debian/mysql/install-sql
===================================================================
--- freepbx/trunk/debian/mysql/install-sql	2007-04-30 05:00:27 UTC (rev 3502)
+++ freepbx/trunk/debian/mysql/install-sql	2007-04-30 11:40:34 UTC (rev 3503)
@@ -86,20 +86,26 @@
 . /etc/amportal.conf
 
 if [ "xxx$AMPDBUSER" == "xxx" ]; then
-	echo "AMPDBUSER is not configured on /etc/amportal.conf"                   >&2
+	echo "AMPDBUSER is not configured on /etc/amportal.conf"                           >&2
 	echo "please update configuration and run /usr/share/freepbx-common/apply_conf.sh" >&2
 	exit 1
 fi
 
 if [ "xxx$AMPDBPASS" == "xxx" ]; then
-	echo "AMPDBPASS is not configured on /etc/amportal.conf"                   >&2
+	echo "AMPDBPASS is not configured on /etc/amportal.conf"                           >&2
 	echo "please update configuration and run /usr/share/freepbx-common/apply_conf.sh" >&2
 	exit 1
 fi
 
-echo "creating asterisk DB"
+echo -n "Creating asterisk DB"
 create_db "asterisk" "$AMPDBUSER" "$AMPDBPASS" "$SQLDIR/newinstall.sql"
+echo "."
 
-echo "creating asteriskcdr DB"
+echo -n "Creating asteriskcdr DB"
 create_db "asteriskcdrdb" "$AMPDBUSER" "$AMPDBPASS" "$SQLDIR/cdr_mysql_table.sql"
+echo "."
 
+# Add a default incoming route to the "custom" context demo:
+echo -n "Creating default incoming route"
+echo "insert into incoming (cidnum, extension, channel, destination) values ('', '', '', 'demo,s,1');" | $MYSQL "asterisk"
+"."

Modified: freepbx/trunk/debian/patches/fix-agibin-dir.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-agibin-dir.dpatch	2007-04-30 05:00:27 UTC (rev 3502)
+++ freepbx/trunk/debian/patches/fix-agibin-dir.dpatch	2007-04-30 11:40:34 UTC (rev 3503)
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad freepbx-2.2.1~dfsg~/amp_conf/agi-bin/directory freepbx-2.2.1~dfsg/amp_conf/agi-bin/directory
 --- freepbx-2.2.1~dfsg~/amp_conf/agi-bin/directory	2006-08-10 07:38:06.000000000 +0300
-+++ freepbx-2.2.1~dfsg/amp_conf/agi-bin/directory	2007-04-26 09:11:16.000000000 +0300
++++ freepbx-2.2.1~dfsg/amp_conf/agi-bin/directory	2007-04-26 10:29:30.000000000 +0300
 @@ -385,7 +385,7 @@
  
  $agi = new AGI;
@@ -20,7 +20,7 @@
  $null = null;
 diff -urNad freepbx-2.2.1~dfsg~/amp_conf/agi-bin/fixlocalprefix freepbx-2.2.1~dfsg/amp_conf/agi-bin/fixlocalprefix
 --- freepbx-2.2.1~dfsg~/amp_conf/agi-bin/fixlocalprefix	2006-12-06 22:50:30.000000000 +0200
-+++ freepbx-2.2.1~dfsg/amp_conf/agi-bin/fixlocalprefix	2007-04-26 09:06:34.000000000 +0300
++++ freepbx-2.2.1~dfsg/amp_conf/agi-bin/fixlocalprefix	2007-04-26 10:29:30.000000000 +0300
 @@ -69,7 +69,7 @@
  
  */
@@ -32,7 +32,7 @@
  include(AGIBIN_DIR."/phpagi.php");
 diff -urNad freepbx-2.2.1~dfsg~/amp_conf/agi-bin/recordingcheck freepbx-2.2.1~dfsg/amp_conf/agi-bin/recordingcheck
 --- freepbx-2.2.1~dfsg~/amp_conf/agi-bin/recordingcheck	2006-06-26 02:46:50.000000000 +0300
-+++ freepbx-2.2.1~dfsg/amp_conf/agi-bin/recordingcheck	2007-04-26 09:06:34.000000000 +0300
++++ freepbx-2.2.1~dfsg/amp_conf/agi-bin/recordingcheck	2007-04-26 10:29:30.000000000 +0300
 @@ -17,7 +17,7 @@
  The program checks determines if Asterisk should record a call
  */
@@ -42,3 +42,15 @@
  
  include(AGIBIN_DIR."/phpagi.php");
  
+diff -urNad freepbx-2.2.1~dfsg~/amp_conf/bin/archive_recordings freepbx-2.2.1~dfsg/amp_conf/bin/archive_recordings
+--- freepbx-2.2.1~dfsg~/amp_conf/bin/archive_recordings	2006-06-26 02:46:50.000000000 +0300
++++ freepbx-2.2.1~dfsg/amp_conf/bin/archive_recordings	2007-04-26 10:32:05.000000000 +0300
+@@ -2,7 +2,7 @@
+ <?php
+ 
+ define("AMP_CONF", "/etc/amportal.conf");
+-define("PHP_ASMANAGER", "/var/lib/asterisk/bin/php-asmanager.php");
++define("PHP_ASMANAGER", "/usr/share/freepbx/common/php-asmanager.php");
+ define("MONITOR_DIR", "/var/spool/asterisk/monitor");
+ 
+ function out($text) {

Modified: freepbx/trunk/debian/sqlite3/install-sql
===================================================================
--- freepbx/trunk/debian/sqlite3/install-sql	2007-04-30 05:00:27 UTC (rev 3502)
+++ freepbx/trunk/debian/sqlite3/install-sql	2007-04-30 11:40:34 UTC (rev 3503)
@@ -53,6 +53,11 @@
 chmod 660 $AMPDBFILE
 
 
-echo "creating asterisk DB at $AMPDBFILE"
+echo -n "creating asterisk DB at $AMPDBFILE"
 cat /usr/share/freepbx-common/sql/newinstall.sqlite3.sql | sqlite3 $AMPDBFILE
+"."
 
+# Add a default incoming route to the "custom" context demo:
+echo -n "Creating default incoming route"
+echo "insert into incoming (cidnum, extension, channel, destination) values ('', '', '', 'demo,s,1');" |  sqlite3 $AMPDBFILE
+"."