[media-sound/teamspeak-server-bin] bump to 3.1.1

media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service

@@ -1,21 +0,0 @@
-[Unit]
-Description=TeamSpeak 3 Server
-After=network.target
-
-[Service]
-Type=simple
-Environment=LD_LIBRARY_PATH=/opt/teamspeak3-server
-WorkingDirectory=/opt/teamspeak3-server
-ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
-ExecStart=/opt/teamspeak3-server/sbin/ts3server-bin inifile=/etc/teamspeak3-server/server.conf
-ExecStop=/bin/kill -15 $MAINPID
-StandardOutput=syslog
-StandardError=syslog
-User=teamspeak3
-Group=teamspeak3
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-
-# vim:syntax=dosini

media-sound/teamspeak-server-bin/files/teamspeak.initd

@@ -1,12 +1,14 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-name="TeamSpeak Server"
-command="/usr/sbin/ts3server"
-pidfile="/run/teamspeak3-server/server.pid"
+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
@@ -21,17 +23,17 @@ start_pre() {
 	# 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 teamspeak3:teamspeak3 --mode 0700 /run/teamspeak3-server
+	checkpath -d --owner ${user}:${group} --mode 0700 /run/teamspeak3-server
 }
 
 start() {
 	ebegin "Starting ${name}"
 
-	start-stop-daemon --start --quiet --background \
-		--pidfile "/run/teamspeak3-server/server.pid" --make-pidfile \
-		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--exec "/usr/sbin/ts3server" -- \
-		inifile="/etc/teamspeak3-server/server.conf"
+	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 $?
 }

media-sound/teamspeak-server-bin/files/teamspeak.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=TeamSpeak3 Server
+After=network-online.target
+
+[Service]
+Type=simple
+User=teamspeak
+Group=teamspeak
+WorkingDirectory=/opt/teamspeak3-server
+Environment="LD_LIBRARY_PATH=/opt/teamspeak3-server"
+Environment="TS3SERVER_LICENSE=accept"
+ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+ExecStart=/opt/bin/ts3server inifile=/etc/teamspeak3-server/ts3server.ini
+
+[Install]
+WantedBy=multi-user.target

media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles

@@ -1,4 +1,4 @@
 # systemd tmpfile settings for teamspeak3-server
 # See tmpfiles.d(5) for details
 
-d /var/run/teamspeak3-server 0755 teamspeak3 teamspeak3 -
+d /var/run/teamspeak3 0755 teamspeak teamspeak -

media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample

@@ -4,4 +4,4 @@ port=3306
 username=teamspeak
 password=teamspeak
 database=teamspeak
-socket=
+socket=

media-sound/teamspeak-server-bin/files/ts3server

@@ -1,10 +0,0 @@
-#! /bin/bash
-
-BASEDIR="/opt/teamspeak3-server"
-
-export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-
-# work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
-cd "${BASEDIR}"
-
-exec "${BASEDIR}/sbin/ts3server-bin" $*

media-sound/teamspeak-server-bin/files/ts3server-bin

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Sets BASEDIR for teamspeak3-server
+BASEDIR="/opt/teamspeak3-server"
+
+# Work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+
+# Launch teamspeak3-server
+cd "${BASEDIR}" && exec "${BASEDIR}/ts3server" $*

media-sound/teamspeak-server-bin/files/ts3server.ini

@@ -18,3 +18,6 @@ logquerycommands=0
 dbclientkeepdays=30
 logappend=0
 query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1

media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample

@@ -0,0 +1,23 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+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
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_mariadb/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1