[Pkg-voip-commits] r3104 - in freepbx/trunk/debian: . patches rapid

Diego Iastrubni elcuco-guest at alioth.debian.org
Wed Jan 31 09:50:00 CET 2007


Author: elcuco-guest
Date: 2007-01-31 09:50:00 +0100 (Wed, 31 Jan 2007)
New Revision: 3104

Added:
   freepbx/trunk/debian/patches/add-sqlite3-support.dpatch
   freepbx/trunk/debian/rapid/newinstall.sqlite3.sql
Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/control
   freepbx/trunk/debian/freepbx-admin.install
   freepbx/trunk/debian/freepbx-admin.prerm
   freepbx/trunk/debian/patches/00list
   freepbx/trunk/debian/patches/fix-module_admin.dpatch
   freepbx/trunk/debian/rapid/freepbx-install-mysql.sh
   freepbx/trunk/debian/rapid/freepbx-remove-mysql.sh
Log:
sql,mysql,php [4/5] commit:

- the package now supports several combintaitons of sql servers (sqlite2, sqlite3, mysql4, mysql5) as well as php (4,5, cgi + apache modules).
- the sqlite3 support has been taken from trunk. 
- mysql5 has some issues with GRANT ALL PERMISSIONS, which was work arounded (by looking at wordpress debian directory...).
- i also modified the control file, and now things should work "better" (see first issue on this post)
- some cosmetics in some cleanup scripts






Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/changelog	2007-01-31 08:50:00 UTC (rev 3104)
@@ -2,10 +2,14 @@
 
   * New upstream release
   * Lets use the new ugly debian scheme for versions
+  * Updated list of virtual packages
   * freepbx-admin: applied a patch to fix a bug in enum lookups
   * freepbx-admin: added a workarround for upstream bug 1694 (fixed upstream already)
+  * freepbx-admin: fixed a problem which happens uninstall of buggy modules (fixes upstream bug 1731)
+  * freepbx-admin: added a patch to support sqlite3, backport from trunk
+  * asterisk-config-freepbx: sox is not longer a requirement, it's only recommended now
 
- -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Wed, 10 Jan 2007 18:00:00 +0200
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Wed, 31 Jan 2007 12:00:00 +0200
 
 freepbx (2.1.3.dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/control	2007-01-31 08:50:00 UTC (rev 3104)
@@ -39,7 +39,7 @@
 
 Package: freepbx-apache2-mysql
 Architecture: all
-Depends: apache2, libapache2-mod-php4, mysql-server|virtual-mysql-server, php4-mysql
+Depends: apache2, libapache2-mod-php4, mysql-server|virtual-mysql-server, php4-mysql, php4-pear
 Description: FreePBX - apache2+mysql support package
  Dummy package to install all packages needed for installing FreePBX with 
  mysql and apache2.
@@ -47,12 +47,20 @@
 
 Package: freepbx-apache2-mysql-php5
 Architecture: all
-Depends: apache2, libapache2-mod-php5, mysql-server|virtual-mysql-server, php5-mysql
+Depends: apache2, libapache2-mod-php5, mysql-server|virtual-mysql-server, php5-mysql, php-pear
 Description: FreePBX - apache2+mysql5 support package
  Dummy package to install all packages needed for installing FreePBX with 
  mysql5 and apache2.
  Please install this package before installing freepbx-admin.
 
+Package: freepbx-apache2-sqlite3-php5
+Architecture: all
+Depends: apache2, libapache2-mod-php5, sqlite3, php5-sqlite3, php-pear
+Description: FreePBX - apache2+mysql5 support package
+ Dummy package to install all packages needed for installing FreePBX with 
+ mysql5 and apache2.
+ Please install this package before installing freepbx-admin.
+
 Package: freepbx-mathopd-mysql
 Architecture: all
 Depends: mathopd, php4-cgi, mysql-server|virtual-mysql-server, php4-mysql
@@ -63,15 +71,24 @@
  
 Package: freepbx-mathopd-sqlite
 Architecture: all
-Depends: mathopd, php4-cgi, sqlite, php4-sqlite
+Depends: mathopd, php5-cgi|php4-cgi, sqlite, php5-sqlite|php4-sqlite 
 Description: FreePBX - mathopd+sqlite support package
  Dummy package to install all packages needed for installing FreePBX with 
  mathopd and sqlite.
  Please install this package before installing freepbx-admin.
 
+Package: freepbx-mathopd-sqlite3
+Architecture: all
+Depends: mathopd, php5-cgi|php4-cgi, sqlite3, php5-sqlite3|php4-sqlite
+Description: FreePBX - mathopd+sqlite3 support package
+ Dummy package to install all packages needed for installing FreePBX with 
+ mathopd and sqlite.
+ Please install this package before installing freepbx-admin.
+
 Package: asterisk-config-freepbx
 Architecture: all
-Depends: freepbx-agi, asterisk-sounds-main, asterisk-sounds-extra, freepbx-sounds-extra|amportal-sounds-extra|amportal-sounds-extra-links, sox, libapache2-mod-php5|libapache2-mod-php4|php5-cgi|php4-cgi
+Depends: freepbx-agi, asterisk-sounds-main, asterisk-sounds-extra, freepbx-sounds-extra|amportal-sounds-extra|amportal-sounds-extra-links, libapache2-mod-php5|libapache2-mod-php4|php5-cgi|php4-cgi
+Recommends: sox
 Provides: asterisk-config-custom
 Replaces: asterisk-config, asterisk-config-amportal
 Conflicts: asterisk-config-amportal, amportal-agi
@@ -139,7 +156,7 @@
 Architecture: all
 Replaces: amportal-common, freepbx-module-core
 Conflicts: amportal-common, freepbx-module-core
-Depends: adduser, asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php4|libapache2-mod-php5|php5-cgi|php4-cgi, mysql-server|virtual-mysql-server|sqlite, php5-mysql|php4-mysql|php4-sqlite, php5-cli|php4-cli, php5-pear|php-pear|php4-pear, libdbi-perl
+Depends: adduser, asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php4|libapache2-mod-php5|php5-cgi|php4-cgi, mysql-server|virtual-mysql-server|sqlite|sqlite3, php-db, php5-mysql|php4-mysql|php5|sqlite3|php5-sqlite3|php4-sqlite, php5-cli|php4-cli, php5-pear|php-pear|php4-pear, libdbi-perl
 Description: FreePBX administration panel
  FreePBX (formally AMP) is a web-based GUI for Asterisk. 
  This package contains the common files needed for freepbx, as well as 

Modified: freepbx/trunk/debian/freepbx-admin.install
===================================================================
--- freepbx/trunk/debian/freepbx-admin.install	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/freepbx-admin.install	2007-01-31 08:50:00 UTC (rev 3104)
@@ -23,6 +23,7 @@
 debian/rapid/post-reload/*				usr/share/freepbx-common/post-reload/
 
 SQL/*.sql						usr/share/freepbx-common/sql/
+debian/rapid/newinstall.sqlite3.sql			usr/share/freepbx-common/sql/
 upgrades/*						usr/share/freepbx-common/upgrades/
 debian/rapid/upgrades/*					usr/share/freepbx-common/upgrades/
 

Modified: freepbx/trunk/debian/freepbx-admin.prerm
===================================================================
--- freepbx/trunk/debian/freepbx-admin.prerm	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/freepbx-admin.prerm	2007-01-31 08:50:00 UTC (rev 3104)
@@ -27,7 +27,7 @@
 		# this may fall, no problems
 		# TODO WTF? this is already gone
  		/usr/share/freepbx-common/freepbx-remove-mysql.sh || true
- 		/usr/share/freepbx-common/freepbx-remove-freepbx.sh || true
+ 		/usr/share/freepbx-common/freepbx-remove-sqlite.sh || true
 		
 		rm -f /etc/amportal.conf || true
 	;;

Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/patches/00list	2007-01-31 08:50:00 UTC (rev 3104)
@@ -9,6 +9,9 @@
 disable-online-updates
 clean-install-amp
 
+# backports from trunk
+add-sqlite3-support
+
 # pending patches, still need to be ported 
 # to freepbx-2.2
 #fix-open-or-die

Added: freepbx/trunk/debian/patches/add-sqlite3-support.dpatch
===================================================================
--- freepbx/trunk/debian/patches/add-sqlite3-support.dpatch	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/patches/add-sqlite3-support.dpatch	2007-01-31 08:50:00 UTC (rev 3104)
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add-sqlite3-support.dpatch by  <diegolocal at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad upstream~/amp_conf/htdocs/admin/common/db_connect.php upstream/amp_conf/htdocs/admin/common/db_connect.php
+--- upstream~/amp_conf/htdocs/admin/common/db_connect.php	2006-06-25 13:37:15.000000000 +0300
++++ upstream/amp_conf/htdocs/admin/common/db_connect.php	2007-01-28 16:12:07.000000000 +0200
+@@ -49,6 +49,18 @@
+ 		$db->connect( $DSN );
+ 		break;
+ 	
++	case "sqlite3":
++		if (!isset($amp_conf["AMPDBFILE"]))
++			die("You must setup properly AMPDBFILE in /etc/amportal.conf");
++			
++		if (isset($amp_conf["AMPDBFILE"]) == "")
++			die("AMPDBFILE in /etc/amportal.conf cannot be blank");
++
++		require_once('DB/sqlite3.php');
++		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
++		$db = DB::connect($datasource);
++		break;
++
+ 	default:
+ 		die( "Unknown SQL engine: [$db_engine]");
+ }
+diff -urNad upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php
+--- upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php	2007-01-03 03:33:31.000000000 +0200
++++ upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php	2007-01-28 16:12:59.000000000 +0200
+@@ -1411,7 +1411,7 @@
+ 	global $db;
+ 	global $amp_conf;
+ 	
+-	if ( $amp_conf["AMPDBENGINE"] == "sqlite")
++	if ( ($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3") )
+ 	{
+ 		// TODO: sqlite work arround - diego 
+ 		// need to reorder the trunks in PHP code
+@@ -1660,7 +1660,7 @@
+ {
+ 	global $amp_conf;
+ 	
+-	if ( $amp_conf["AMPDBENGINE"] == "sqlite")
++	if ( ($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3") )
+ 	{
+ 		// TODO: sqlite work arround - diego
+ 		$results = sql("SELECT DISTINCT context FROM extensions WHERE context LIKE 'outrt-%' ORDER BY context ","getAll");


Property changes on: freepbx/trunk/debian/patches/add-sqlite3-support.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: freepbx/trunk/debian/patches/fix-module_admin.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-module_admin.dpatch	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/patches/fix-module_admin.dpatch	2007-01-31 08:50:00 UTC (rev 3104)
@@ -2,11 +2,12 @@
 ## fix-module_admin.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
 ##
 ## DP: Create a connection to the manager in the module_admin
+## DP: work around buggy freepbx-modules uninstall script (closes upstream 1731)
 
 @DPATCH@
 diff -urNad upstream~/amp_conf/bin/module_admin upstream/amp_conf/bin/module_admin
---- upstream~/amp_conf/bin/module_admin	2007-01-14 14:00:02.000000000 +0200
-+++ upstream/amp_conf/bin/module_admin	2007-01-14 16:38:31.000000000 +0200
+--- upstream~/amp_conf/bin/module_admin	2006-10-23 10:44:58.000000000 +0200
++++ upstream/amp_conf/bin/module_admin	2007-01-31 10:03:08.000000000 +0200
 @@ -52,7 +52,7 @@
  }
  
@@ -36,3 +37,14 @@
  	// connect to database
  	if (!file_exists(AMP_BASE_INCLUDE_PATH.'/common/db_connect.php')) {
  		fatal('Cannot locate '.AMP_BASE_INCLUDE_PATH.'/common/db_connect.php');
+@@ -461,6 +467,10 @@
+ 	out('WARNING: "force" is enabled, it is possible to create problems');
+ }
+ 
++// freepbx modules will include the unsintall scripts
++// using relative paths. why not modifiying the include dir...?
++chdir ( $amp_conf["AMPWEBROOT"] . "/admin/" );
++
+ switch ($operation ) {
+ 	case 'list':
+ 		showList();

Modified: freepbx/trunk/debian/rapid/freepbx-install-mysql.sh
===================================================================
--- freepbx/trunk/debian/rapid/freepbx-install-mysql.sh	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/rapid/freepbx-install-mysql.sh	2007-01-31 08:50:00 UTC (rev 3104)
@@ -57,7 +57,7 @@
 		exec_command "$MYSQLADMIN create $DB";
 	fi
 
-	CMD="GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,ALTER  ON $DB.* TO $DB_USER@$SQL_HOST IDENTIFIED BY '$DB_PASSWD';"
+        CMD="GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,ALTER  ON $DB.* TO $DB_USER@$SQL_HOST IDENTIFIED BY '$DB_PASSWD';"
 # 	echo $CMD
 	echo $CMD | $MYSQL mysql
 

Modified: freepbx/trunk/debian/rapid/freepbx-remove-mysql.sh
===================================================================
--- freepbx/trunk/debian/rapid/freepbx-remove-mysql.sh	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/rapid/freepbx-remove-mysql.sh	2007-01-31 08:50:00 UTC (rev 3104)
@@ -43,9 +43,8 @@
 	DB=$1
 
 	if [ -d /var/lib/mysql/$DB ]; then
-		echo -n "Dropping $DB"
+		echo "Dropping $DB ... "
 		exec_command "$MYSQLADMIN DROP $DB";
-		echo "."
 	fi
 }
 

Added: freepbx/trunk/debian/rapid/newinstall.sqlite3.sql
===================================================================
--- freepbx/trunk/debian/rapid/newinstall.sqlite3.sql	2007-01-30 17:40:40 UTC (rev 3103)
+++ freepbx/trunk/debian/rapid/newinstall.sqlite3.sql	2007-01-31 08:50:00 UTC (rev 3104)
@@ -0,0 +1,450 @@
+-- MySQL dump 10.9
+--
+-- Host: localhost    Database: asterisk
+-- ------------------------------------------------------
+-- Server version	4.1.20
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `Backup`
+--
+
+DROP TABLE IF EXISTS `Backup`;
+CREATE TABLE `Backup` (
+  `Name` varchar(50) default NULL,
+  `Voicemail` varchar(50) default NULL,
+  `Recordings` varchar(50) default NULL,
+  `Configurations` varchar(50) default NULL,
+  `CDR` varchar(55) default NULL,
+  `FOP` varchar(50) default NULL,
+  `Minutes` varchar(50) default NULL,
+  `Hours` varchar(50) default NULL,
+  `Days` varchar(50) default NULL,
+  `Months` varchar(50) default NULL,
+  `Weekdays` varchar(50) default NULL,
+  `Command` varchar(200) default NULL,
+  `Method` varchar(50) default NULL,
+  `ID` integer NOT NULL PRIMARY KEY AUTOINCREMENT
+) ;
+
+--
+-- Dumping data for table `Backup`
+--
+
+
+/*!40000 ALTER TABLE `Backup` DISABLE KEYS */;
+-- /* TABLES `Backup` WRITE;
+--  TABLES;*/
+/*!40000 ALTER TABLE `Backup` ENABLE KEYS */;
+
+--
+-- Table structure for table `admin`
+--
+
+DROP TABLE IF EXISTS `admin`;
+CREATE TABLE `admin` (
+  `variable` varchar(20) NOT NULL default '',
+  `value` varchar(80) NOT NULL default '',
+  PRIMARY KEY  (`variable`)
+) ;
+
+--
+-- Dumping data for table `admin`
+--
+
+
+/*!40000 ALTER TABLE `admin` DISABLE KEYS */;
+--  TABLES `admin` WRITE;
+INSERT INTO `admin` VALUES ('need_reload','true');
+INSERT INTO `admin` VALUES ('version','2.2.0beta3');
+--  TABLES;
+/*!40000 ALTER TABLE `admin` ENABLE KEYS */;
+
+--
+-- Table structure for table `ampusers`
+--
+
+DROP TABLE IF EXISTS `ampusers`;
+CREATE TABLE `ampusers` (
+  `username` varchar(20) NOT NULL default '',
+  `password` varchar(20) NOT NULL default '',
+  `extension_low` varchar(20) NOT NULL default '',
+  `extension_high` varchar(20) NOT NULL default '',
+  `deptname` varchar(20) NOT NULL default '',
+  `sections` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`username`)
+) ;
+
+--
+-- Dumping data for table `ampusers`
+--
+
+
+/*!40000 ALTER TABLE `ampusers` DISABLE KEYS */;
+--  TABLES `ampusers` WRITE;
+INSERT INTO `ampusers` VALUES ('admin','admin','','','','*');
+--  TABLES;
+/*!40000 ALTER TABLE `ampusers` ENABLE KEYS */;
+
+--
+-- Table structure for table `devices`
+--
+
+DROP TABLE IF EXISTS `devices`;
+CREATE TABLE `devices` (
+  `id` varchar(20) NOT NULL default '',
+  `tech` varchar(10) NOT NULL default '',
+  `dial` varchar(50) NOT NULL default '',
+  `devicetype` varchar(5) NOT NULL default '',
+  `user` varchar(50) default NULL,
+  `description` varchar(50) default NULL,
+  `emergency_cid` varchar(100) default NULL
+) ;
+
+--
+-- Dumping data for table `devices`
+--
+
+
+/*!40000 ALTER TABLE `devices` DISABLE KEYS */;
+--  TABLES `devices` WRITE;
+--  TABLES;
+/*!40000 ALTER TABLE `devices` ENABLE KEYS */;
+
+--
+-- Table structure for table `extensions`
+--
+
+DROP TABLE IF EXISTS `extensions`;
+CREATE TABLE `extensions` (
+  `context` varchar(45) NOT NULL default 'default',
+  `extension` varchar(45) NOT NULL default '',
+  `priority` varchar(5) NOT NULL default '1',
+  `application` varchar(45) NOT NULL default '',
+  `args` varchar(255) default NULL,
+  `descr` text,
+  `flags` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`context`,`extension`,`priority`)
+) ;
+
+--
+-- Dumping data for table `extensions`
+--
+
+
+/*!40000 ALTER TABLE `extensions` DISABLE KEYS */;
+--  TABLES `extensions` WRITE;
+INSERT INTO `extensions` VALUES ('outrt-001-9_outside','_9.','1','Macro','dialout-trunk,1,${EXTEN:1}',NULL,0);
+INSERT INTO `extensions` VALUES ('outrt-001-9_outside','_9.','2','Macro','outisbusy','No available circuits',0);
+INSERT INTO `extensions` VALUES ('outbound-allroutes','include','1','outrt-001-9_outside','','',2);
+--  TABLES;
+/*!40000 ALTER TABLE `extensions` ENABLE KEYS */;
+
+--
+-- Table structure for table `featurecodes`
+--
+
+DROP TABLE IF EXISTS `featurecodes`;
+CREATE TABLE `featurecodes` (
+  `modulename` varchar(50) NOT NULL default '',
+  `featurename` varchar(50) NOT NULL default '',
+  `description` varchar(200) NOT NULL default '',
+  `defaultcode` varchar(20) default NULL,
+  `customcode` varchar(20) default NULL,
+  `enabled` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`modulename`,`featurename`)
+--   KEY `enabled` (`enabled`)
+) ;
+
+--
+-- Dumping data for table `featurecodes`
+--
+
+
+/*!40000 ALTER TABLE `featurecodes` DISABLE KEYS */;
+--  TABLES `featurecodes` WRITE;
+INSERT INTO `featurecodes` VALUES ('core','userlogon','User Logon','*11',NULL,1);
+INSERT INTO `featurecodes` VALUES ('core','userlogoff','User Logoff','*12',NULL,1);
+INSERT INTO `featurecodes` VALUES ('core','zapbarge','ZapBarge','888',NULL,1);
+INSERT INTO `featurecodes` VALUES ('core','simu_pstn','Simulate Incoming Call','7777',NULL,1);
+INSERT INTO `featurecodes` VALUES ('core','simu_fax','Simulate Incoming FAX Call','666',NULL,1);
+INSERT INTO `featurecodes` VALUES ('core','chanspy','ChanSpy','555',NULL,1);
+INSERT INTO `featurecodes` VALUES ('core','pickup','Call Pickup (Can be used with GXP-2000)','**',NULL,1);
+--  TABLES;
+/*!40000 ALTER TABLE `featurecodes` ENABLE KEYS */;
+
+--
+-- Table structure for table `freepbx_log`
+--
+
+DROP TABLE IF EXISTS `freepbx_log`;
+CREATE TABLE `freepbx_log` (
+  `id` integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `time` datetime NOT NULL default '0000-00-00 00:00:00',
+  `section` varchar(50) default NULL,
+--   `level` enum('error','warning','debug','devel-debug') NOT NULL default 'error',
+--  `level` enum('error','warning','debug','devel-debug') NOT NULL,
+ `level` varchar(10),
+  `status` int(11) NOT NULL default '0',
+  `message` text NOT NULL
+-- ,
+--   PRIMARY KEY  (`id`),
+--   KEY `time` (`time`,`level`)
+) ;
+
+--
+-- Dumping data for table `freepbx_log`
+--
+
+
+/*!40000 ALTER TABLE `freepbx_log` DISABLE KEYS */;
+--  TABLES `freepbx_log` WRITE;
+INSERT INTO `freepbx_log` VALUES (1,'2006-11-06 01:55:36','retrieve_conf','devel-debug',0,'Started retrieve_conf, DB Connection OK');
+INSERT INTO `freepbx_log` VALUES (2,'2006-11-06 01:55:36','retrieve_conf','devel-debug',0,'Writing extensions_additional.conf');
+--  TABLES;
+/*!40000 ALTER TABLE `freepbx_log` ENABLE KEYS */;
+
+--
+-- Table structure for table `globals`
+--
+
+DROP TABLE IF EXISTS `globals`;
+CREATE TABLE `globals` (
+  `variable` char(20) NOT NULL default '',
+  `value` char(50) NOT NULL default '',
+  PRIMARY KEY  (`variable`)
+) ;
+
+--
+-- Dumping data for table `globals`
+--
+
+
+/*!40000 ALTER TABLE `globals` DISABLE KEYS */;
+--  /*TABLES*/ `globals` WRITE;
+INSERT INTO `globals` VALUES ('CALLFILENAME','\"\"');
+INSERT INTO `globals` VALUES ('DIAL_OPTIONS','tr');
+INSERT INTO `globals` VALUES ('TRUNK_OPTIONS','');
+INSERT INTO `globals` VALUES ('DIAL_OUT','9');
+INSERT INTO `globals` VALUES ('FAX','');
+INSERT INTO `globals` VALUES ('FAX_RX','system');
+INSERT INTO `globals` VALUES ('FAX_RX_EMAIL','fax at mydomain.com');
+INSERT INTO `globals` VALUES ('FAX_RX_FROM','freepbx at gmail.com');
+INSERT INTO `globals` VALUES ('INCOMING','group-all');
+INSERT INTO `globals` VALUES ('NULL','\"\"');
+INSERT INTO `globals` VALUES ('OPERATOR','');
+INSERT INTO `globals` VALUES ('OPERATOR_XTN','');
+INSERT INTO `globals` VALUES ('PARKNOTIFY','SIP/200');
+INSERT INTO `globals` VALUES ('RECORDEXTEN','\"\"');
+INSERT INTO `globals` VALUES ('RINGTIMER','15');
+INSERT INTO `globals` VALUES ('DIRECTORY','last');
+INSERT INTO `globals` VALUES ('AFTER_INCOMING','');
+INSERT INTO `globals` VALUES ('IN_OVERRIDE','forcereghours');
+INSERT INTO `globals` VALUES ('REGTIME','7:55-17:05');
+INSERT INTO `globals` VALUES ('REGDAYS','mon-fri');
+INSERT INTO `globals` VALUES ('DIRECTORY_OPTS','');
+INSERT INTO `globals` VALUES ('DIALOUTIDS','1');
+INSERT INTO `globals` VALUES ('OUT_1','ZAP/g0');
+INSERT INTO `globals` VALUES ('VM_PREFIX','*');
+INSERT INTO `globals` VALUES ('VM_OPTS','');
+INSERT INTO `globals` VALUES ('VM_GAIN','');
+INSERT INTO `globals` VALUES ('VM_DDTYPE','u');
+INSERT INTO `globals` VALUES ('TIMEFORMAT','kM');
+INSERT INTO `globals` VALUES ('TONEZONE','us');
+INSERT INTO `globals` VALUES ('ALLOW_SIP_ANON','no');
+--  TABLES;
+/*!40000 ALTER TABLE `globals` ENABLE KEYS */;
+
+--
+-- Table structure for table `iax`
+--
+
+DROP TABLE IF EXISTS `iax`;
+CREATE TABLE `iax` (
+  `id` varchar(20) NOT NULL default '-1',
+  `keyword` varchar(30) NOT NULL default '',
+  `data` varchar(150) NOT NULL default '',
+  `flags` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`id`,`keyword`)
+) ;
+
+--
+-- Dumping data for table `iax`
+--
+
+
+/*!40000 ALTER TABLE `iax` DISABLE KEYS */;
+--  TABLES `iax` WRITE;
+--  TABLES;
+/*!40000 ALTER TABLE `iax` ENABLE KEYS */;
+
+--
+-- Table structure for table `incoming`
+--
+
+DROP TABLE IF EXISTS `incoming`;
+CREATE TABLE `incoming` (
+  `cidnum` varchar(20) default NULL,
+  `extension` varchar(20) default NULL,
+  `destination` varchar(50) default NULL,
+  `faxexten` varchar(20) default NULL,
+  `faxemail` varchar(50) default NULL,
+  `answer` tinyint(1) default NULL,
+  `wait` int(2) default NULL,
+  `privacyman` tinyint(1) default NULL,
+  `alertinfo` varchar(32) default NULL,
+  `channel` varchar(20) default NULL,
+  `ringing` varchar(20) default NULL
+) ;
+
+--
+-- Dumping data for table `incoming`
+--
+
+
+/*!40000 ALTER TABLE `incoming` DISABLE KEYS */;
+--  TABLES `incoming` WRITE;
+--  TABLES;
+/*!40000 ALTER TABLE `incoming` ENABLE KEYS */;
+
+--
+-- Table structure for table `modules`
+--
+
+DROP TABLE IF EXISTS `modules`;
+CREATE TABLE `modules` (
+  `id` INTEGER NOT NULL  PRIMARY KEY AUTOINCREMENT,
+  `modulename` varchar(50) NOT NULL default '',
+  `version` varchar(20) NOT NULL default '',
+  `enabled` tinyint(4) NOT NULL default '0'
+) ;
+
+--
+-- Dumping data for table `modules`
+--
+
+
+/*!40000 ALTER TABLE `modules` DISABLE KEYS */;
+--  TABLES `modules` WRITE;
+INSERT INTO `modules` VALUES (1,'core','1.2',1);
+--  TABLES;
+/*!40000 ALTER TABLE `modules` ENABLE KEYS */;
+
+--
+-- Table structure for table `queues`
+--
+
+DROP TABLE IF EXISTS `queues`;
+CREATE TABLE `queues` (
+  `id` bigint(11) NOT NULL default '-1',
+  `keyword` varchar(20) NOT NULL default '',
+  `data` varchar(150) NOT NULL default '',
+  `flags` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`id`,`keyword`,`data`)
+) ;
+
+--
+-- Dumping data for table `queues`
+--
+
+
+/*!40000 ALTER TABLE `queues` DISABLE KEYS */;
+--  TABLES `queues` WRITE;
+--  TABLES;
+/*!40000 ALTER TABLE `queues` ENABLE KEYS */;
+
+--
+-- Table structure for table `sip`
+--
+
+DROP TABLE IF EXISTS `sip`;
+CREATE TABLE `sip` (
+  `id` varchar(20) NOT NULL default '-1',
+  `keyword` varchar(30) NOT NULL default '',
+  `data` varchar(150) NOT NULL default '',
+  `flags` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`id`,`keyword`)
+) ;
+
+--
+-- Dumping data for table `sip`
+--
+
+
+/*!40000 ALTER TABLE `sip` DISABLE KEYS */;
+--  TABLES `sip` WRITE;
+--  TABLES;
+/*!40000 ALTER TABLE `sip` ENABLE KEYS */;
+
+--
+-- Table structure for table `users`
+--
+
+DROP TABLE IF EXISTS `users`;
+CREATE TABLE `users` (
+  `extension` varchar(20) NOT NULL default '',
+  `password` varchar(20) default NULL,
+  `name` varchar(50) default NULL,
+  `voicemail` varchar(50) default NULL,
+  `ringtimer` int(3) default NULL,
+  `noanswer` varchar(100) default NULL,
+  `recording` varchar(50) default NULL,
+  `outboundcid` varchar(50) default NULL,
+  `directdid` varchar(50) default NULL,
+  `didalert` varchar(50) default NULL,
+  `faxexten` varchar(20) default NULL,
+  `faxemail` varchar(50) default NULL,
+  `answer` tinyint(1) default NULL,
+  `wait` int(2) default NULL,
+  `privacyman` tinyint(1) default NULL
+) ;
+
+--
+-- Dumping data for table `users`
+--
+
+
+/*!40000 ALTER TABLE `users` DISABLE KEYS */;
+--  TABLES `users` WRITE;
+--  TABLES;
+/*!40000 ALTER TABLE `users` ENABLE KEYS */;
+
+--
+-- Table structure for table `zap`
+--
+
+DROP TABLE IF EXISTS `zap`;
+CREATE TABLE `zap` (
+  `id` varchar(20) NOT NULL default '-1',
+  `keyword` varchar(30) NOT NULL default '',
+  `data` varchar(150) NOT NULL default '',
+  `flags` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`id`,`keyword`)
+) ;
+
+--
+-- Dumping data for table `zap`
+--
+
+
+/*!40000 ALTER TABLE `zap` DISABLE KEYS */;
+--  TABLES `zap` WRITE;
+--  TABLES;
+/*!40000 ALTER TABLE `zap` ENABLE KEYS */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+




More information about the Pkg-voip-commits mailing list