master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tunable TURNDBDIR

Browse Source
This commit is contained in:
mom040267 2014-11-23 21:24:04 +00:00
parent 10fdcf9005
commit dafedda0b9
12 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL
View File

@ -85,7 +85,7 @@ Or:
You can change the auxiliary configured destination sub-directories by You can change the auxiliary configured destination sub-directories by
setting BINDIR, CONFDIR, MANPREFIX, EXAMPLESDIR, DOCSDIR, LIBDIR, SCHEMADIR, setting BINDIR, CONFDIR, MANPREFIX, EXAMPLESDIR, DOCSDIR, LIBDIR, SCHEMADIR,
LOCALSTATEDIR and TURNINCLUDEDIR variables in the LOCALSTATEDIR, TURNDBDIR and TURNINCLUDEDIR variables in the
configure command line. For example: configure command line. For example:
$ PREFIX=/opt BINDIR=/opt/bin64 CONFDIR=/opt/conf ./configure $ PREFIX=/opt BINDIR=/opt/bin64 CONFDIR=/opt/conf ./configure
@ -171,7 +171,7 @@ This command will also:
- copy the content of examples subdirectory into - copy the content of examples subdirectory into
PREFIX/share/examples/turnserver/ directory; PREFIX/share/examples/turnserver/ directory;
- copy the generated default empty SQLite database from sqlite/turndb - copy the generated default empty SQLite database from sqlite/turndb
to /var/db/turndb; to /usr/local/var/db or to /var/db/turndb;
- copy the content of include/turn subdirectory into - copy the content of include/turn subdirectory into
PREFIX/include/turn/ directory; PREFIX/include/turn/ directory;
- copy the database schema file turndb/schema.sql into - copy the database schema file turndb/schema.sql into

8
Makefile.in
View File

@ -106,13 +106,13 @@ sqlite/turndb : turndb/schema.sql
${MKDIR} sqlite ${MKDIR} sqlite
${RMCMD} sqlite/turndb ${RMCMD} sqlite/turndb
${SQLITE_CMD} sqlite/turndb < turndb/schema.sql ${SQLITE_CMD} sqlite/turndb < turndb/schema.sql
### Install all: ### Install all:
install: all ${MAKE_DEPS} install: all ${MAKE_DEPS}
${MKDIR} ${DESTDIR}${PREFIX} ${MKDIR} ${DESTDIR}${PREFIX}
${MKDIR} ${DESTDIR}${BINDIR} ${MKDIR} ${DESTDIR}${BINDIR}
${MKDIR} ${DESTDIR}${LOCALSTATEDIR}/db ${MKDIR} ${DESTDIR}${TURNDBDIR}
${MKDIR} ${DESTDIR}${MANPREFIX}/man/man1 ${MKDIR} ${DESTDIR}${MANPREFIX}/man/man1
${MKDIR} ${DESTDIR}${CONFDIR} ${MKDIR} ${DESTDIR}${CONFDIR}
${MKDIR} ${DESTDIR}${LIBDIR} ${MKDIR} ${DESTDIR}${LIBDIR}
@ -150,7 +150,7 @@ install: all ${MAKE_DEPS}
${INSTALL_DATA} turndb/schema.userdb.redis ${DESTDIR}${SCHEMADIR} ${INSTALL_DATA} turndb/schema.userdb.redis ${DESTDIR}${SCHEMADIR}
${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${DOCSDIR} ${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${DOCSDIR}
${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${SCHEMADIR} ${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${SCHEMADIR}
if [ -f sqlite/turndb ] ; then ${INSTALL_DATA} sqlite/turndb ${DESTDIR}${LOCALSTATEDIR}/db/turndb; fi if [ -f sqlite/turndb ] ; then ${INSTALL_DATA} sqlite/turndb ${DESTDIR}${TURNDBDIR}/turndb; fi
${INSTALL_DATA} examples/etc/turnserver.conf ${DESTDIR}${CONFDIR}/turnserver.conf.default ${INSTALL_DATA} examples/etc/turnserver.conf ${DESTDIR}${CONFDIR}/turnserver.conf.default
${INSTALL_DIR} examples/etc ${DESTDIR}${EXAMPLESDIR} ${INSTALL_DIR} examples/etc ${DESTDIR}${EXAMPLESDIR}
${INSTALL_DIR} examples/scripts ${DESTDIR}${EXAMPLESDIR} ${INSTALL_DIR} examples/scripts ${DESTDIR}${EXAMPLESDIR}
@ -161,7 +161,7 @@ install: all ${MAKE_DEPS}
deinstall: ${MAKE_DEPS} deinstall: ${MAKE_DEPS}
${PKILL_PROGRAM} turnserver || ${ECHO_CMD} OK ${PKILL_PROGRAM} turnserver || ${ECHO_CMD} OK
${RMCMD} ${DESTDIR}${LOCALSTATEDIR}/db/turndb ${RMCMD} ${DESTDIR}${TURNDBDIR}/turndb
${RMCMD} ${DESTDIR}${DOCSDIR} ${RMCMD} ${DESTDIR}${DOCSDIR}
${RMCMD} ${DESTDIR}${SCHEMADIR} ${RMCMD} ${DESTDIR}${SCHEMADIR}
${RMCMD} ${DESTDIR}${BINDIR}/turnserver ${RMCMD} ${DESTDIR}${BINDIR}/turnserver

4
README.turnadmin
View File

@ -81,7 +81,7 @@ Commands:
Options with required values: Options with required values:
-b, --db, --userdb SQLite user database file name (default - /var/db/turndb or -b, --db, --userdb SQLite user database file name (default - /var/db/turndb or
/usr/local/var/db/turndb). /usr/local/var/db/turndb or /var/lib/turn/turndb).
See the same option in the turnserver section. See the same option in the turnserver section.
-e, --psql-userdb PostgreSQL user database connection string. -e, --psql-userdb PostgreSQL user database connection string.
See the --psql-userdb option in the turnserver section. See the --psql-userdb option in the turnserver section.
@ -175,6 +175,8 @@ to see the man page.
/usr/local/var/db/turndb /usr/local/var/db/turndb
/var/lib/turn/turndb
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
===================================== =====================================

8
README.turnserver
View File

@ -82,7 +82,7 @@ Config file settings:
User database settings: User database settings:
-b, --db, --userdb SQLite user database file name (default - /var/db/turndb or -b, --db, --userdb SQLite user database file name (default - /var/db/turndb or
/usr/local/var/db/turndb). /usr/local/var/db/turndb or /var/lib/turn/turndb).
-e, --psql-userdb User database connection string for PostgreSQL. -e, --psql-userdb User database connection string for PostgreSQL.
This database can be used for long-term and short-term This database can be used for long-term and short-term
@ -718,7 +718,7 @@ Obviously, only a few users can be set that way, and their credentials are fixed
for the turnserver process lifetime. for the turnserver process lifetime.
2) Users can be stored in SQLite DB. The default SQLite database file is /var/db/turndb 2) Users can be stored in SQLite DB. The default SQLite database file is /var/db/turndb
or /usr/local/var/db/turndb. or /usr/local/var/db/turndb or /var/lib/turn/turndb.
3) Users can be stored in PostgreSQL database, if the turnserver was compiled with PostgreSQL 3) Users can be stored in PostgreSQL database, if the turnserver was compiled with PostgreSQL
support. Each time turnserver checks user credentials, it reads the database (asynchronously, support. Each time turnserver checks user credentials, it reads the database (asynchronously,
@ -773,7 +773,7 @@ with schema.sql SQL script. With Redis, you do not have to do even that - just r
it will set the users for you (see the turnadmin manuals). If you are using SQLite, then the it will set the users for you (see the turnadmin manuals). If you are using SQLite, then the
turnserver or turnadmin will initialize the empty database, for you, when started. The turnserver or turnadmin will initialize the empty database, for you, when started. The
TURN server installation process creates an empty initialized SQLite database in the default TURN server installation process creates an empty initialized SQLite database in the default
location (/var/db/turndb or /usr/local/var/db/turndb, depending on the system). location (/var/db/turndb or /usr/local/var/db/turndb or /var/lib/turn/turndb, depending on the system).
================================= =================================
@ -850,6 +850,8 @@ FILES
/usr/local/var/db/turndb /usr/local/var/db/turndb
/var/lib/turn/turndb
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
================================= =================================

2
README.turnutils
View File

@ -255,6 +255,8 @@ FILES
/usr/local/var/db/turndb /usr/local/var/db/turndb
/var/lib/turn/turndb
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
================================= =================================

13
configure vendored
View File

@ -351,6 +351,11 @@ do
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* | --localstate=* | --localstat=*) -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* | --localstate=* | --localstat=*)
LOCALSTATEDIR=$ac_optarg ;; LOCALSTATEDIR=$ac_optarg ;;
-turndbdir | --turndbdir | --turndbdi | --turndbd | --turndb | --turnd)
ac_prev=TURNDBDIR ;;
-turndbdir=* | --turndbdir=* | --turndbdi=* | --turndbd=* | --turndb=* | --turnd=*)
TURNDBDIR=$ac_optarg ;;
-datadir | --datadir | --datadi | --datad | -schemadir | --schemadir) -datadir | --datadir | --datadi | --datad | -schemadir | --schemadir)
ac_prev=SCHEMADIR ;; ac_prev=SCHEMADIR ;;
-datadir=* | --datadir=* | --datadi=* | --datad=* | -schemadir=* | --schemadir=*) -datadir=* | --datadir=* | --datadi=* | --datad=* | -schemadir=* | --schemadir=*)
@ -1100,6 +1105,10 @@ else
SQLITE_CMD=${ECHO_CMD} SQLITE_CMD=${ECHO_CMD}
fi fi
if [ -z "${TURNDBDIR}" ] ; then
TURNDBDIR=${LOCALSTATEDIR}/db
fi
########################### ###########################
# Test PostgreSQL # Test PostgreSQL
########################### ###########################
@ -1199,7 +1208,7 @@ fi
# So, what we have now: # So, what we have now:
############################### ###############################
OSCFLAGS="${OSCFLAGS} ${TURN_NO_THREAD_BARRIERS} ${TURN_NO_DTLS} ${TURN_NO_GCM} ${TURN_NO_TLS} -DINSTALL_PREFIX=${PREFIX} -DTURNDB=${LOCALSTATEDIR}/db/turndb" OSCFLAGS="${OSCFLAGS} ${TURN_NO_THREAD_BARRIERS} ${TURN_NO_DTLS} ${TURN_NO_GCM} ${TURN_NO_TLS} -DINSTALL_PREFIX=${PREFIX} -DTURNDB=${TURNDBDIR}/turndb"
if ! [ -z "${TURN_ACCEPT_RPATH}" ] ; then if ! [ -z "${TURN_ACCEPT_RPATH}" ] ; then
if [ -z "${TURN_DISABLE_RPATH}" ] ; then if [ -z "${TURN_DISABLE_RPATH}" ] ; then
@ -1232,6 +1241,8 @@ ${ECHO_CMD} "BINDIR = ${BINDIR}" >> Makefile
${ECHO_CMD} "bindir = ${BINDIR}" >> Makefile ${ECHO_CMD} "bindir = ${BINDIR}" >> Makefile
${ECHO_CMD} "LOCALSTATEDIR = ${LOCALSTATEDIR}" >> Makefile ${ECHO_CMD} "LOCALSTATEDIR = ${LOCALSTATEDIR}" >> Makefile
${ECHO_CMD} "localstatedir = ${LOCALSTATEDIR}" >> Makefile ${ECHO_CMD} "localstatedir = ${LOCALSTATEDIR}" >> Makefile
${ECHO_CMD} "TURNDBDIR = ${TURNDBDIR}" >> Makefile
${ECHO_CMD} "turndbdir = ${TURNDBDIR}" >> Makefile
${ECHO_CMD} "CONFDIR = ${CONFDIR}" >> Makefile ${ECHO_CMD} "CONFDIR = ${CONFDIR}" >> Makefile
${ECHO_CMD} "confdir = ${CONFDIR}" >> Makefile ${ECHO_CMD} "confdir = ${CONFDIR}" >> Makefile
${ECHO_CMD} "MANPREFIX = ${MANPREFIX}" >> Makefile ${ECHO_CMD} "MANPREFIX = ${MANPREFIX}" >> Makefile

3
examples/etc/turnserver.conf
View File

@ -246,7 +246,8 @@
# SQLite database file name. # SQLite database file name.
# #
# Default file name is /var/db/turndb or /usr/local/var/db/turndb. # Default file name is /var/db/turndb or /usr/local/var/db/turndb or
# /var/lib/turn/turndb.
# #
#userdb=/var/db/turndb #userdb=/var/db/turndb

6
man/man1/turnadmin.1
View File

@ -1,5 +1,5 @@
.\" Text automatically generated by txt2man .\" Text automatically generated by txt2man
.TH TURN 1 "21 November 2014" "" "" .TH TURN 1 "23 November 2014" "" ""
.SH GENERAL INFORMATION .SH GENERAL INFORMATION
\fIturnadmin\fP is a TURN administration tool. This tool can be used to manage \fIturnadmin\fP is a TURN administration tool. This tool can be used to manage
@ -133,7 +133,7 @@ Options with required values:
.B .B
\fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP \fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP
SQLite user database file name (default \- /var/db/turndb or SQLite user database file name (default \- /var/db/turndb or
/usr/local/var/db/turndb). /usr/local/var/db/turndb or /var/lib/turn/turndb).
See the same option in the \fIturnserver\fP section. See the same option in the \fIturnserver\fP section.
.TP .TP
.B .B
@ -266,6 +266,8 @@ to see the man page.
.PP .PP
/usr/local/var/db/turndb /usr/local/var/db/turndb
.PP .PP
/var/lib/turn/turndb
.PP
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
.PP .PP
===================================== =====================================

10
man/man1/turnserver.1
View File

@ -1,5 +1,5 @@
.\" Text automatically generated by txt2man .\" Text automatically generated by txt2man
.TH TURN 1 "21 November 2014" "" "" .TH TURN 1 "23 November 2014" "" ""
.SH GENERAL INFORMATION .SH GENERAL INFORMATION
The \fBTURN Server\fP project contains the source code of a TURN server and TURN client The \fBTURN Server\fP project contains the source code of a TURN server and TURN client
@ -133,7 +133,7 @@ User database settings:
.B .B
\fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP \fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP
SQLite user database file name (default \- /var/db/turndb or SQLite user database file name (default \- /var/db/turndb or
/usr/local/var/db/turndb). /usr/local/var/db/turndb or /var/lib/turn/turndb).
.TP .TP
.B .B
\fB\-e\fP, \fB\-\-psql\-userdb\fP \fB\-e\fP, \fB\-\-psql\-userdb\fP
@ -973,7 +973,7 @@ Obviously, only a few users can be set that way, and their credentials are fixed
for the \fIturnserver\fP process lifetime. for the \fIturnserver\fP process lifetime.
.IP 2) 4 .IP 2) 4
Users can be stored in SQLite DB. The default SQLite database file is /var/db/turndb Users can be stored in SQLite DB. The default SQLite database file is /var/db/turndb
or /usr/local/var/db/turndb. or /usr/local/var/db/turndb or /var/lib/turn/turndb.
.IP 3) 4 .IP 3) 4
Users can be stored in PostgreSQL database, if the \fIturnserver\fP was compiled with PostgreSQL Users can be stored in PostgreSQL database, if the \fIturnserver\fP was compiled with PostgreSQL
support. Each time \fIturnserver\fP checks user credentials, it reads the database (asynchronously, support. Each time \fIturnserver\fP checks user credentials, it reads the database (asynchronously,
@ -1028,7 +1028,7 @@ with schema.sql SQL script. With Redis, you do not have to do even that \- just
it will set the users for you (see the \fIturnadmin\fP manuals). If you are using SQLite, then the it will set the users for you (see the \fIturnadmin\fP manuals). If you are using SQLite, then the
\fIturnserver\fP or \fIturnadmin\fP will initialize the empty database, for you, when started. The \fIturnserver\fP or \fIturnadmin\fP will initialize the empty database, for you, when started. The
TURN server installation process creates an empty initialized SQLite database in the default TURN server installation process creates an empty initialized SQLite database in the default
location (/var/db/turndb or /usr/local/var/db/turndb, depending on the system). location (/var/db/turndb or /usr/local/var/db/turndb or /var/lib/turn/turndb, depending on the system).
.PP .PP
================================= =================================
.SH LIBRARIES .SH LIBRARIES
@ -1105,6 +1105,8 @@ it would affect the performance.
.PP .PP
/usr/local/var/db/turndb /usr/local/var/db/turndb
.PP .PP
/var/lib/turn/turndb
.PP
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
.PP .PP
================================= =================================

4
man/man1/turnutils.1
View File

@ -1,5 +1,5 @@
.\" Text automatically generated by txt2man .\" Text automatically generated by txt2man
.TH TURN 1 "21 November 2014" "" "" .TH TURN 1 "23 November 2014" "" ""
.SH GENERAL INFORMATION .SH GENERAL INFORMATION
A set of turnutils_* programs provides some utility functionality to be used A set of turnutils_* programs provides some utility functionality to be used
@ -378,6 +378,8 @@ to see the man page.
.PP .PP
/usr/local/var/db/turndb /usr/local/var/db/turndb
.PP .PP
/var/lib/turn/turndb
.PP
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
.PP .PP
================================= =================================

2
postinstall.txt
View File

@ -17,7 +17,7 @@ service, you have to:
as Redis status & statistics database schema description. as Redis status & statistics database schema description.
If you are using SQLite, the default database location is in If you are using SQLite, the default database location is in
/var/db/turndb or in /usr/local/var/db/turndb. /var/db/turndb or in /usr/local/var/db/turndb or in /var/lib/turn/turndb.
c) add whatever is necessary to enable start-up daemon for the c) add whatever is necessary to enable start-up daemon for the
/usr/local/bin/turnserver. /usr/local/bin/turnserver.

4
src/apps/relay/mainrelay.c
View File

@ -438,7 +438,7 @@ static char Usage[] = "Usage: turnserver [options]\n"
" -c <filename> Configuration file name (default - turnserver.conf).\n" " -c <filename> Configuration file name (default - turnserver.conf).\n"
#if !defined(TURN_NO_SQLITE) #if !defined(TURN_NO_SQLITE)
" -b, , --db, --userdb <filename> SQLite database file name; default - /var/db/turndb or\n" " -b, , --db, --userdb <filename> SQLite database file name; default - /var/db/turndb or\n"
" /usr/local/var/db/turndb.\n" " /usr/local/var/db/turndb or /var/lib/turn/turndb.\n"
#endif #endif
#if !defined(TURN_NO_PQ) #if !defined(TURN_NO_PQ)
" -e, --psql-userdb, --sql-userdb <conn-string> PostgreSQL database connection string, if used (default - empty, no PostreSQL DB used).\n" " -e, --psql-userdb, --sql-userdb <conn-string> PostgreSQL database connection string, if used (default - empty, no PostreSQL DB used).\n"
@ -613,7 +613,7 @@ static char AdminUsage[] = "Usage: turnadmin [command] [options]\n"
"\nOptions with mandatory values:\n\n" "\nOptions with mandatory values:\n\n"
#if !defined(TURN_NO_SQLITE) #if !defined(TURN_NO_SQLITE)
" -b, --db, --userdb SQLite database file, default value is /var/db/turndb or\n" " -b, --db, --userdb SQLite database file, default value is /var/db/turndb or\n"
" /usr/local/var/db/turndb.\n" " /usr/local/var/db/turndb or /var/lib/turn/turndb.\n"
#endif #endif
#if !defined(TURN_NO_PQ) #if !defined(TURN_NO_PQ)
" -e, --psql-userdb, --sql-userdb PostgreSQL user database connection string, if PostgreSQL DB is used.\n" " -e, --psql-userdb, --sql-userdb PostgreSQL user database connection string, if PostgreSQL DB is used.\n"