Merge res_odbc and res_config

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3186 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 29 insertions, 0 deletions

diff --git a/configs/extconfig.conf.sample b/configs/extconfig.conf.sample
new file mode 100755
index 000000000..612490e57
--- /dev/null
+++ b/configs/extconfig.conf.sample
@@ -0,0 +1,6 @@
+[settings]
+
+;uncomment to load queues.conf via the db engine.
+;queues.conf => config_odbc
+
+
diff --git a/configs/res_config_odbc.conf.sample b/configs/res_config_odbc.conf.sample
new file mode 100755
index 000000000..f11cf9481
--- /dev/null
+++ b/configs/res_config_odbc.conf.sample
@@ -0,0 +1,3 @@
+[settings]
+table => ast_config
+connection => mysql1
diff --git a/configs/res_odbc.conf.sample b/configs/res_odbc.conf.sample
new file mode 100755
index 000000000..144eb6a95
--- /dev/null
+++ b/configs/res_odbc.conf.sample
@@ -0,0 +1,20 @@
+;;; odbc setup file 
+
+[mysql1]
+dsn => MySQL-asterisk
+username => myuser
+password => mypass
+pre-connect => yes
+
+
+[mysql2]
+dsn => MySQL-asterisk
+username => myuser
+password => mypass
+pre-connect => yes
+
+
+
+
+
+