Module: sip-router
Branch: master
Commit: 923b738f8f021c349b0d0ba4faaac1b0c6bcf246
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=923b738…
Author: osas <osas(a)centos.(none)>
Committer: osas <osas(a)centos.(none)>
Date: Sat Oct 27 12:00:28 2012 -0400
more openser to kamailio migration
---
config.h | 4 ++--
etc/kamailio.cfg | 2 +-
utils/kamctl/kamctl.dbtext | 2 +-
utils/kamctl/kamctl.sqlbase | 8 ++++----
utils/kamctl/kamctlrc | 10 +++++-----
utils/kamctl/kamdbctl.base | 10 +++++-----
utils/kamctl/kamdbctl.mysql | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/config.h b/config.h
index 72761e9..8fde9b5 100644
--- a/config.h
+++ b/config.h
@@ -192,9 +192,9 @@
#if defined KAMAILIO_MOD_INTERFACE || defined OPENSER_MOD_INTERFACE || \
defined MOD_INTERFACE_V1
- #define DEFAULT_DB_URL "mysql://openser:openserrw@localhost/openser"
+ #define DEFAULT_DB_URL "mysql://kamailio:kamailiorw@localhost/kamailio"
#define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1)
- #define DEFAULT_RODB_URL "mysql://openserro:openserro@localhost/openser"
+ #define DEFAULT_RODB_URL "mysql://kamailio:kamailiorw@localhost/okamailio"
#define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1)
#else
#define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser"
diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
index 20db35b..247ddd9 100644
--- a/etc/kamailio.cfg
+++ b/etc/kamailio.cfg
@@ -109,7 +109,7 @@ import_file "kamailio-local.cfg"
# - database URL - used to connect to database server by modules such
# as: auth_db, acc, usrloc, a.s.o.
#!ifndef DBURL
-#!define DBURL "mysql://openser:openserrw@localhost/openser"
+#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio"
#!endif
#!endif
#!ifdef WITH_MULTIDOMAIN
diff --git a/utils/kamctl/kamctl.dbtext b/utils/kamctl/kamctl.dbtext
index f25bed6..0c1ac9a 100644
--- a/utils/kamctl/kamctl.dbtext
+++ b/utils/kamctl/kamctl.dbtext
@@ -20,7 +20,7 @@ fi;
# path to the dbtext database
if [ -z "$DBTEXT_PATH" ] ; then
- DBTEXT_PATH="/usr/local/share/kamailio/dbtext/openser"
+ DBTEXT_PATH="/usr/local/share/kamailio/dbtext/kamailio"
fi
export DBTEXT_PATH
diff --git a/utils/kamctl/kamctl.sqlbase b/utils/kamctl/kamctl.sqlbase
index e1de2c6..b1615b9 100644
--- a/utils/kamctl/kamctl.sqlbase
+++ b/utils/kamctl/kamctl.sqlbase
@@ -9,21 +9,21 @@
### common variables and functions for SQL engines
if [ -z "$DBNAME" ] ; then
- DBNAME=openser
+ DBNAME=kamailio
fi
if [ -z "$DBHOST" ] ; then
DBHOST=localhost
fi
if [ -z "$DBRWUSER" ] ; then
- DBRWUSER=openser
+ DBRWUSER=kamailio
fi
# the read-only user for whom password may be stored here
if [ -z "$DBROUSER" ] ; then
- DBROUSER=openserro
+ DBROUSER=kamailioro
fi
if [ -z "$DBROPW" ] ; then
- DBROPW=openserro
+ DBROPW=kamailioro
fi
# full privileges SQL user
diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc
index e075436..259f8e9 100644
--- a/utils/kamctl/kamctlrc
+++ b/utils/kamctl/kamctlrc
@@ -23,22 +23,22 @@
# DBHOST=localhost
## database name (for ORACLE this is TNS name)
-# DBNAME=openser
+# DBNAME=kamailio
# database path used by dbtext, db_berkeley or sqlite
# DB_PATH="/usr/local/etc/kamailio/dbtext"
## database read/write user
-# DBRWUSER=openser
+# DBRWUSER=kamailio
## password for database read/write user
-# DBRWPW="openserrw"
+# DBRWPW="kamailiorw"
## database read only user
-# DBROUSER=openserro
+# DBROUSER=kamailioro
## password for database read only user
-# DBROPW=openserro
+# DBROPW=kamailioro
## database super user (for ORACLE this is 'scheme-creator' user)
# DBROOTUSER="root"
diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base
index 60a0849..8e367be 100644
--- a/utils/kamctl/kamdbctl.base
+++ b/utils/kamctl/kamdbctl.base
@@ -3,22 +3,22 @@ PATH=$PATH:/usr/local/sbin
# config vars
# name of the database to be used by Kamailio
-DBNAME=${DBNAME:-openser}
+DBNAME=${DBNAME:-kamailio}
# address of database server
DBHOST=${DBHOST:-localhost}
# user with full privileges over DBNAME database
-DBRWUSER=${DBRWUSER:-openser}
+DBRWUSER=${DBRWUSER:-kamailio}
# password user with full privileges over DBNAME database
-DBRWPW=${DBRWPW:-openserrw}
+DBRWPW=${DBRWPW:-kamailiorw}
# read-only user
-DBROUSER=${DBROUSER:-openserro}
+DBROUSER=${DBROUSER:-kamailioro}
# password for read-only user
-DBROPW=${DBROPW:-openserro}
+DBROPW=${DBROPW:-kamailioro}
# user name column
USERCOL=${USERCOL:-username}
diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql
index 52996e5..5f66337 100644
--- a/utils/kamctl/kamdbctl.mysql
+++ b/utils/kamctl/kamdbctl.mysql
@@ -137,7 +137,7 @@ db_charset_test
minfo "creating database $1 ..."
-# Users: openser is the regular user, openserro only for reading
+# Users: kamailio is the regular user, kamailioro only for reading
sql_query "" "create database $1 character set $CHARSET;
GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER' IDENTIFIED BY '$DBRWPW';
GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW';