4 files changed, 36 insertions, 46 deletions
diff --git a/media-sound/teamspeak-server/files/teamspeak.initd b/media-sound/teamspeak-server/files/teamspeak.initd
deleted file mode 100644
index cc8393b58db7..000000000000
--- a/media-sound/teamspeak-server/files/teamspeak.initd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/opt/bin/ts3server"
-command_background="true"
-group="teamspeak"
-inifile="/etc/teamspeak3-server/ts3server.ini"
-name="TeamSpeak Server"
-pidfile="/run/teamspeak3-server/server.pid"
-user="teamspeak"
-
-depend() {
-	need net
-	use mysql
-}
-
-start_pre() {
-	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
-	LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
-	export LD_LIBRARY_PATH
-
-	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
-	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
-
-	checkpath -d --owner ${user}:${group} --mode 0700 /run/teamspeak3-server
-}
-
-start() {
-	ebegin "Starting ${name}"
-
-	start-stop-daemon --start --quiet --background --env "TS3SERVER_LICENSE=accept" \
-		--pidfile "${pidfile}" --make-pidfile \
-		--user "${user}" --group "${group}" --chdir "/opt/teamspeak3-server" \
-		--exec "${command}" -- \
-		inifile="${inifile}"
-
-	eend $?
-}
-
-restart() {
-	stop
-	sleep 3
-	start
-}
diff --git a/media-sound/teamspeak-server/files/teamspeak.initd-r1 b/media-sound/teamspeak-server/files/teamspeak.initd-r1
new file mode 100644
index 000000000000..85d807509d37
--- /dev/null
+++ b/media-sound/teamspeak-server/files/teamspeak.initd-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config="/etc/teamspeak3-server/ts3server.ini"
+name="TeamSpeak3 Server"
+pidfile="/run/${RC_SVCNAME}.pid"
+start_stop_daemon_args="--chdir /opt/teamspeak3-server --env TS3SERVER_LICENSE=accept"
+
+command="/opt/bin/ts3server"
+command_args="inifile=${config}"
+command_background="true"
+command_group="teamspeak"
+command_user="teamspeak"
+
+depend() {
+	use mysql
+}
+
+start_pre() {
+	# Fix for EPERM bug
+	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+}
diff --git a/media-sound/teamspeak-server/files/ts3server.ini b/media-sound/teamspeak-server/files/ts3server.ini-r1
index 962c8b80f0ad..769e815a1997 100644
--- a/media-sound/teamspeak-server/files/ts3server.ini
+++ b/media-sound/teamspeak-server/files/ts3server.ini-r1
@@ -21,3 +21,9 @@ query_skipbruteforcecheck=0
 query_buffer_mb=20
 http_proxy=
 license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
index 94cea8bbe9d8..6b2a28d2976b 100644
--- a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample
+++ b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
@@ -9,7 +9,7 @@ query_ip=0.0.0.0, ::
 query_ip_whitelist=query_ip_whitelist.txt
 query_ip_blacklist=query_ip_blacklist.txt
 dbplugin=ts3db_mariadb
-dbpluginparameter=ts3db_mariadb.ini
+dbpluginparameter=/etc/teamspeak3-server/ts3db_mariadb.ini
 dbsqlpath=/opt/teamspeak3-server/sql/
 dbsqlcreatepath=create_mariadb/
 dbconnections=10
@@ -21,3 +21,9 @@ query_skipbruteforcecheck=0
 query_buffer_mb=20
 http_proxy=
 license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300