From dcc132223bc2542a227f66873d36e1f3d4add585 Mon Sep 17 00:00:00 2001 From: mom040267 Date: Sun, 16 Nov 2014 19:05:12 +0000 Subject: [PATCH] /var/db changed to /var --- Makefile.in | 2 -- README.turnadmin | 4 ++-- README.turnserver | 6 +++--- README.turnutils | 2 +- examples/etc/turnserver.conf | 4 ++-- man/man1/turnadmin.1 | 6 +++--- man/man1/turnserver.1 | 8 ++++---- man/man1/turnutils.1 | 4 ++-- postinstall.txt | 3 --- rpm/turnserver.spec | 1 - src/apps/relay/userdb.h | 2 +- 11 files changed, 18 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index e4f31284..ea5ea7b0 100755 --- a/Makefile.in +++ b/Makefile.in @@ -142,7 +142,6 @@ install: all ${MAKE_DEPS} ${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${DOCSDIR} ${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${SCHEMADIR} ${INSTALL_DATA} examples/etc/turnserver.conf ${DESTDIR}${CONFDIR}/turnserver.conf.default - ${INSTALL_DATA} examples/var/db/turdb ${DESTDIR}/var/db/turndb ${INSTALL_DIR} examples/etc ${DESTDIR}${EXAMPLESDIR} ${INSTALL_DIR} examples/scripts ${DESTDIR}${EXAMPLESDIR} ${RMCMD} ${DESTDIR}${EXAMPLESDIR}/scripts/rfc5769.sh @@ -169,7 +168,6 @@ deinstall: ${MAKE_DEPS} ${RMCMD} ${DESTDIR}${LIBDIR}/libturnclient.a ${RMCMD} ${DESTDIR}${EXAMPLESDIR}/ ${RMCMD} ${DESTDIR}${CONFDIR}/turnserver.conf.default - ${RMCMD} ${DESTDIR}/var/db/turndb ${RMCMD} ${DESTDIR}${TURNINCLUDEDIR} uninstall: deinstall diff --git a/README.turnadmin b/README.turnadmin index a2f6b27d..269dfbbb 100644 --- a/README.turnadmin +++ b/README.turnadmin @@ -80,7 +80,7 @@ Commands: Options with required values: --b, --db, --userdb SQLite user database file name (default - /var/db/turndb). +-b, --db, --userdb SQLite user database file name (default - /var/turndb). See the same option in the turnserver section. -e, --psql-userdb PostgreSQL user database connection string. See the --psql-userdb option in the turnserver section. @@ -170,7 +170,7 @@ to see the man page. /etc/turnserver.conf -/var/db/turndb +/var/turndb /usr/local/etc/turnserver.conf diff --git a/README.turnserver b/README.turnserver index b82b1745..d35658bc 100644 --- a/README.turnserver +++ b/README.turnserver @@ -81,7 +81,7 @@ Config file settings: User database settings: --b, --db, --userdb SQLite user database file name (default - /var/db/turndb). +-b, --db, --userdb SQLite user database file name (default - /var/turndb). -e, --psql-userdb User database connection string for PostgreSQL. This database can be used for long-term and short-term @@ -716,7 +716,7 @@ For the user database, the turnserver has the following options: Obviously, only a few users can be set that way, and their credentials are fixed 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/turndb. 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, @@ -841,7 +841,7 @@ FILES /etc/turnserver.conf -/var/db/turndb +/var/turndb /usr/local/etc/turnserver.conf diff --git a/README.turnutils b/README.turnutils index 61757a28..42f9359a 100644 --- a/README.turnutils +++ b/README.turnutils @@ -251,7 +251,7 @@ FILES /etc/turnserver.conf -/var/db/turndb +/var/turndb /usr/local/etc/turnserver.conf diff --git a/examples/etc/turnserver.conf b/examples/etc/turnserver.conf index 0e583685..bfef53b7 100644 --- a/examples/etc/turnserver.conf +++ b/examples/etc/turnserver.conf @@ -250,9 +250,9 @@ # SQLite database file name. # -# Default file name is /var/db/turndb +# Default file name is /var/turndb # -#userdb=/var/db/turndb +#userdb=/var/turndb # PostgreSQL database connection string in the case that we are using PostgreSQL # as the user database. diff --git a/man/man1/turnadmin.1 b/man/man1/turnadmin.1 index f58dcbbc..d92301b9 100644 --- a/man/man1/turnadmin.1 +++ b/man/man1/turnadmin.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "15 November 2014" "" "" +.TH TURN 1 "16 November 2014" "" "" .SH GENERAL INFORMATION \fIturnadmin\fP is a TURN administration tool. This tool can be used to manage @@ -132,7 +132,7 @@ Options with required values: .TP .B \fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP -SQLite user database file name (default \- /var/db/turndb). +SQLite user database file name (default \- /var/turndb). See the same option in the \fIturnserver\fP section. .TP .B @@ -261,7 +261,7 @@ to see the man page. /etc/turnserver.conf .PP -/var/db/turndb +/var/turndb .PP /usr/local/etc/turnserver.conf .PP diff --git a/man/man1/turnserver.1 b/man/man1/turnserver.1 index 48391eec..1833f4a6 100644 --- a/man/man1/turnserver.1 +++ b/man/man1/turnserver.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "15 November 2014" "" "" +.TH TURN 1 "16 November 2014" "" "" .SH GENERAL INFORMATION The \fBTURN Server\fP project contains the source code of a TURN server and TURN client @@ -132,7 +132,7 @@ User database settings: .TP .B \fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP -SQLite user database file name (default \- /var/db/turndb). +SQLite user database file name (default \- /var/turndb). .TP .B \fB\-e\fP, \fB\-\-psql\-userdb\fP @@ -971,7 +971,7 @@ Users can be set in the command line, with multiple \fB\-u\fP or \fB\-\-user\fP Obviously, only a few users can be set that way, and their credentials are fixed for the \fIturnserver\fP process lifetime. .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/turndb. .IP 3) 4 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, @@ -1096,7 +1096,7 @@ it would affect the performance. /etc/turnserver.conf .PP -/var/db/turndb +/var/turndb .PP /usr/local/etc/turnserver.conf .PP diff --git a/man/man1/turnutils.1 b/man/man1/turnutils.1 index af881a18..8b405f1e 100644 --- a/man/man1/turnutils.1 +++ b/man/man1/turnutils.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "15 November 2014" "" "" +.TH TURN 1 "16 November 2014" "" "" .SH GENERAL INFORMATION A set of turnutils_* programs provides some utility functionality to be used @@ -374,7 +374,7 @@ to see the man page. /etc/turnserver.conf .PP -/var/db/turndb +/var/turndb .PP /usr/local/etc/turnserver.conf .PP diff --git a/postinstall.txt b/postinstall.txt index d178d399..27a427b8 100644 --- a/postinstall.txt +++ b/postinstall.txt @@ -16,9 +16,6 @@ service, you have to: database schema description and/or /usr/local/share/turnserver/schema.stats.redis as Redis status & statistics database schema description. - The installation process automatically creates /var/db/turndb SQlite database file, - with pre-set example data tables. - c) add whatever is necessary to enable start-up daemon for the /usr/local/bin/turnserver. 2) If you do not want the turnserver to be a system service, diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec index 49f119e4..ae1218de 100644 --- a/rpm/turnserver.spec +++ b/rpm/turnserver.spec @@ -167,7 +167,6 @@ fi %defattr(-,root,root) %{_bindir}/turnserver %{_bindir}/turnadmin -%{_localstatedir}/db/turndb %{_mandir}/man1/coturn.1.gz %{_mandir}/man1/turnserver.1.gz %{_mandir}/man1/turnadmin.1.gz diff --git a/src/apps/relay/userdb.h b/src/apps/relay/userdb.h index ebd2a17b..17f3c56f 100644 --- a/src/apps/relay/userdb.h +++ b/src/apps/relay/userdb.h @@ -48,7 +48,7 @@ extern "C" { //////////// Defines ////////////////////////////// -#define DEFAULT_USERDB_FILE "/var/db/turndb" +#define DEFAULT_USERDB_FILE ("/var/turndb") #define AUTH_SECRET_SIZE (512)