From 9dab0d6d76ab9af90773fccb6404cfaaba5c33c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 11 May 2013 05:06:56 +0200 Subject: [PATCH] fix lineendings, also change to -server since i really don't care and everything else is silly. --- .../files/systemd/teamspeak3.conf | 2 +- .../files/teamspeak3-server.rc | 80 +++++++++---------- .../files/teamspeak3-tsdns-server.rc | 4 +- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf index c83afe3..8496c1e 100644 --- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf +++ b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf @@ -1,4 +1,4 @@ # systemd tmpfile settings for teamspeak3-server # See tmpfiles.d(5) for details -d /var/run/teamspeak3 0755 teamspeak3 teamspeak3 - +d /var/run/teamspeak3-server 0755 teamspeak3 teamspeak3 - diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc index 8911f4b..a5a7d7f 100644 --- a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc +++ b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc @@ -1,40 +1,40 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc,v 1.1 2013/04/25 18:11:05 tomwij Exp $ - -depend() { - need net - use mysql -} - -start() { - ebegin "Starting TeamSpeak 3 Server" - - # 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 - - start-stop-daemon --start --quiet --background \ - --pidfile "/var/run/teamspeak3/server.pid" --make-pidfile \ - --user "teamspeak3" --chdir "/opt/teamspeak3-server" \ - --exec "/usr/sbin/ts3server" -- \ - inifile="/etc/teamspeak3-server/server.conf" - - eend $? -} - -stop() { - ebegin "Stopping TeamSpeak 3 Server" - - start-stop-daemon --stop --quiet \ - --pidfile "/var/run/teamspeak3/server.pid" - - eend $? -} - -restart() { - svc_stop - sleep 3 - svc_start -} +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc,v 1.1 2013/04/25 18:11:05 tomwij Exp $ + +depend() { + need net + use mysql +} + +start() { + ebegin "Starting TeamSpeak 3 Server" + + # 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 + + start-stop-daemon --start --quiet --background \ + --pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \ + --user "teamspeak3" --chdir "/opt/teamspeak3-server" \ + --exec "/usr/sbin/ts3server" -- \ + inifile="/etc/teamspeak3-server/server.conf" + + eend $? +} + +stop() { + ebegin "Stopping TeamSpeak 3 Server" + + start-stop-daemon --stop --quiet \ + --pidfile "/var/run/teamspeak3-server/server.pid" + + eend $? +} + +restart() { + svc_stop + sleep 3 + svc_start +} diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc index 247013f..abeecbd 100644 --- a/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc +++ b/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc @@ -11,7 +11,7 @@ start() { ebegin "Starting TeamSpeak 3 TSDNS Server" start-stop-daemon --start --quiet --background \ - --pidfile "/var/run/teamspeak3/tsdns.pid" --make-pidfile \ + --pidfile "/var/run/teamspeak3-server/tsdns.pid" --make-pidfile \ --user "teamspeak3" --chdir "/opt/teamspeak3-server/tsdns" \ --exec "/opt/teamspeak3-server/tsdns/tsdnsserver" @@ -22,7 +22,7 @@ stop() { ebegin "Stopping TeamSpeak 3 TSDNS Server" start-stop-daemon --stop --quiet \ - --pidfile "/var/run/teamspeak3/tsdns.pid" + --pidfile "/var/run/teamspeak3-server/tsdns.pid" eend $? }