diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-13 21:22:33 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-13 21:22:33 +0000 |
| commit | 607988f17b6ab703402b22502b751ebe9fa1ec3b (patch) | |
| tree | 09826367dd718544b289f1484e5bb40393f8c414 /configs | |
| parent | e6cf30c5ae0a9157f66d4e42e95c796a1741ea9d (diff) | |
Merge changes from team/russell/sqlite:
* Add new module, cdr_sqlite3_custom which allows logging custom CDRs into a
SQLite3 database. (issue #7149, alerios)
* Add new module, res_config_sqlite, which adds realtime database configuration
support for SQLite version 2. I decided that this was ok since we didn't have
any realtime support for version 3. If someone ports this to version 3, then
version 2 support can be removed or marked deprecated.
(issue #7790, rbarun_proformatique)
* Mark cdr_sqlite as deprecated in favor of cdr_sqlite3_custom.
Also, note that there were other modules on the bug tracker that did not make
the cut because they provided some duplicated functionality. Those are:
* cdr_sqlite3 (issue #6754, moy)
* cdr_sqlite3 (issue #8694, bsd)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@58866 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/cdr_sqlite3_custom.conf | 7 | ||||
| -rw-r--r-- | configs/extconfig.conf.sample | 7 | ||||
| -rw-r--r-- | configs/res_config_sqlite.conf | 15 |
3 files changed, 29 insertions, 0 deletions
diff --git a/configs/cdr_sqlite3_custom.conf b/configs/cdr_sqlite3_custom.conf new file mode 100644 index 000000000..55872b383 --- /dev/null +++ b/configs/cdr_sqlite3_custom.conf @@ -0,0 +1,7 @@ +; +; Mappings for custom config file +; +[master] ; currently, only file "master.db" is supported, with only one table at a time. +table => cdr +columns => calldate, clid, dcontext, channel, dstchannel, lastapp, lastdata, duration, billsec, disposition, amaflags, accountcode, uniqueid, userfield, test +values => '${CDR(start)}','${CDR(clid)}','${CDR(dcontext)}','${CDR(channel)}','${CDR(dstchannel)}','${CDR(lastapp)}','${CDR(lastdata)}','${CDR(duration)}','${CDR(billsec)}','${CDR(disposition)}','${CDR(amaflags)}','${CDR(accountcode)}','${CDR(uniqueid)}','${CDR(userfield)}','${CDR(test)}' diff --git a/configs/extconfig.conf.sample b/configs/extconfig.conf.sample index 0266ddc4a..82f33f83d 100644 --- a/configs/extconfig.conf.sample +++ b/configs/extconfig.conf.sample @@ -18,6 +18,7 @@ ;uncomment to load queues.conf via the odbc engine. ; ;queues.conf => odbc,asterisk,ast_config +;extensions.conf => sqlite,asterisk,ast_config ; ; The following files CANNOT be loaded from Realtime storage: ; asterisk.conf @@ -42,6 +43,12 @@ ;example => odbc,asterisk,alttable ;example2 => ldap,"dc=oxymium,dc=net",example2 ; +; "odbc" is shown in the examples below, but is not the only valid realtime +; engine. There is: +; odbc ... res_config_odbc +; sqlite ... res_config_sqlite +; pgsql ... res_config_pgsql +; ;iaxusers => odbc,asterisk ;iaxpeers => odbc,asterisk ;sipusers => odbc,asterisk diff --git a/configs/res_config_sqlite.conf b/configs/res_config_sqlite.conf new file mode 100644 index 000000000..87f1e08bf --- /dev/null +++ b/configs/res_config_sqlite.conf @@ -0,0 +1,15 @@ +[general] + +; The database file. +dbfile => /var/lib/asterisk/sqlite.db + +; Both config_table and cdr_table are optional. If config_table is omitted, +; you must specify it in extconfig.conf. If it is both provided here and in +; extconfig.conf, the value given here is used. If cdr_table is omitted, CDR +; support is simply disabled. +config_table => ast_config +cdr_table => ast_cdr + +; This parameter controls the registration of the SQLITE() Dialplan application. +app_enable => yes + |