[Pkg-voip-commits] [resiprocate] 02/06: Move reTurn configs to etc/reTurn
Daniel Pocock
pocock at moszumanska.debian.org
Mon Jan 13 13:26:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
pocock pushed a commit to branch master
in repository resiprocate.
commit 11ca243e9b738ea5791f73043d0cadada194341c
Author: Daniel Pocock <daniel at pocock.com.au>
Date: Mon Jan 13 12:50:40 2014 +0100
Move reTurn configs to etc/reTurn
---
debian/conf/reTurnServer-users.txt | 1 -
debian/conf/reTurnServer.config | 4 ++--
debian/conf/users.txt | 21 +++++++++++++++++++++
debian/resiprocate-turn-server.dirs | 2 +-
debian/resiprocate-turn-server.init | 2 +-
debian/resiprocate-turn-server.install | 4 ++--
debian/resiprocate-turn-server.postinst | 11 ++++++++++-
debian/resiprocate-turn-server.postrm | 8 ++++++++
debian/resiprocate-turn-server.preinst | 20 ++++++++++++++++++++
9 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/debian/conf/reTurnServer-users.txt b/debian/conf/reTurnServer-users.txt
deleted file mode 100644
index 2ef5942..0000000
--- a/debian/conf/reTurnServer-users.txt
+++ /dev/null
@@ -1 +0,0 @@
-test:foobar:example.org:REFUSED
diff --git a/debian/conf/reTurnServer.config b/debian/conf/reTurnServer.config
index b5b8348..1336499 100644
--- a/debian/conf/reTurnServer.config
+++ b/debian/conf/reTurnServer.config
@@ -128,7 +128,7 @@ AuthenticationRealm = reTurn
#
# This file format is interchangeable with TurnServer.org's user database
#
-UserDatabaseFile = /etc/reTurnServer-users.txt
+UserDatabaseFile = /etc/reTurn/users.txt
# Hashed passwords in the user database file
# This option specifies whether the passwords are plain text
@@ -229,7 +229,7 @@ TlsServerPrivateKeyFilename = server-key.pem
#
# openssl dhparam -outform PEM -out dh512.pem 512
#
-TlsTempDhFilename = /etc/reTurnServer-dh512.pem
+TlsTempDhFilename = /etc/reTurn/dh512.pem
# TLS server private key certificate password required to read
# from PEM file. Leave blank if key is not encrypted.
diff --git a/debian/conf/users.txt b/debian/conf/users.txt
new file mode 100644
index 0000000..5841a86
--- /dev/null
+++ b/debian/conf/users.txt
@@ -0,0 +1,21 @@
+#
+# reTurnServer user database file
+#
+# The format of each line is:
+#
+# login:password:realm:state
+#
+# Typically, the realm field must match the value of AuthenticationRealm
+# defined in reTurnServer.config
+#
+# The state field (not case sensitive) can be one of:
+#
+# authorized (user authorized)
+# refused (user denied access)
+# restricted (for when bandwidth limiting is implemented)
+#
+# This file format is interchangeable with TurnServer.org's user database
+#
+# Comments can be inserted by starting a line with #
+#
+test:foobar:example.org:REFUSED
diff --git a/debian/resiprocate-turn-server.dirs b/debian/resiprocate-turn-server.dirs
index ee19d5d..86ef4f6 100644
--- a/debian/resiprocate-turn-server.dirs
+++ b/debian/resiprocate-turn-server.dirs
@@ -1 +1 @@
-etc
+etc/reTurn
diff --git a/debian/resiprocate-turn-server.init b/debian/resiprocate-turn-server.init
index 0415ba9..e8b6ab6 100644
--- a/debian/resiprocate-turn-server.init
+++ b/debian/resiprocate-turn-server.init
@@ -29,7 +29,7 @@ if [ -f /etc/default/$NAME ] ; then
. /etc/default/$NAME
fi
-DAEMON_OPTS="/etc/reTurnServer.config --Daemonize=true --LoggingType=syslog --PidFile=${PIDFILE}"
+DAEMON_OPTS="/etc/reTurn/reTurnServer.config --Daemonize=true --LoggingType=syslog --PidFile=${PIDFILE}"
if [ ! -d "$PIDFILE_DIR" ];then
mkdir -p "$PIDFILE_DIR"
diff --git a/debian/resiprocate-turn-server.install b/debian/resiprocate-turn-server.install
index 735be55..b848f67 100644
--- a/debian/resiprocate-turn-server.install
+++ b/debian/resiprocate-turn-server.install
@@ -1,3 +1,3 @@
usr/sbin/reTurnServer
-debian/conf/reTurnServer.config etc
-debian/conf/reTurnServer-users.txt etc
+debian/conf/reTurnServer.config etc/reTurn
+debian/conf/users.txt etc/reTurn
diff --git a/debian/resiprocate-turn-server.postinst b/debian/resiprocate-turn-server.postinst
index ad675b4..4852180 100644
--- a/debian/resiprocate-turn-server.postinst
+++ b/debian/resiprocate-turn-server.postinst
@@ -14,6 +14,15 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer.config /etc/reTurn/reTurnServer.config 1.9.0~beta10-1 -- "$@"
+
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer-users.txt /etc/reTurn/users.txt 1.9.0~beta10-1 -- "$@"
+
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer-dh512.pem /etc/reTurn/dh512.pem 1.9.0~beta10-1 -- "$@"
+
# $1 = version of the package being upgraded.
install() {
@@ -35,7 +44,7 @@ install() {
"$RETURN_USER" || exit 1
fi
- DH_PARAM_FILE=/etc/reTurnServer-dh512.pem
+ DH_PARAM_FILE=/etc/reTurn/dh512.pem
if [ ! -f ${DH_PARAM_FILE} ];
then
echo "Generating DH parameters..."
diff --git a/debian/resiprocate-turn-server.postrm b/debian/resiprocate-turn-server.postrm
index f1ca624..2f9e352 100644
--- a/debian/resiprocate-turn-server.postrm
+++ b/debian/resiprocate-turn-server.postrm
@@ -11,6 +11,14 @@ if [ "$1" = "purge" ] ; then
fi
fi
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer.config /etc/reTurn/reTurnServer.config 1.9.0~beta10-1 -- "$@"
+
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer-users.txt /etc/reTurn/users.txt 1.9.0~beta10-1 -- "$@"
+
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer-dh512.pem /etc/reTurn/dh512.pem 1.9.0~beta10-1 -- "$@"
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
diff --git a/debian/resiprocate-turn-server.preinst b/debian/resiprocate-turn-server.preinst
new file mode 100644
index 0000000..bfd8eea
--- /dev/null
+++ b/debian/resiprocate-turn-server.preinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer.config /etc/reTurn/reTurnServer.config 1.9.0~beta10-1 -- "$@"
+
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer-users.txt /etc/reTurn/users.txt 1.9.0~beta10-1 -- "$@"
+
+dpkg-maintscript-helper mv_conffile \
+ /etc/reTurnServer-dh512.pem /etc/reTurn/dh512.pem 1.9.0~beta10-1 -- "$@"
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/resiprocate.git
More information about the Pkg-voip-commits
mailing list