tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

teamspeak: Update server version, fix init script

Browse source
This commit is contained in:
Ossi Salmi 2016-03-14 00:55:35 +02:00
parent 3803888be6
commit 6d2c9e35d7
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
teamspeak/Makefile
View file

@ -1,6 +1,6 @@
include $(CURDIR)/../Makefile.inc include $(CURDIR)/../Makefile.inc
VERSION = 3.0.10.1 VERSION = 3.0.12.3
TARGET32 = teamspeak3-server_linux-x86-$(VERSION).tar.gz TARGET32 = teamspeak3-server_linux-x86-$(VERSION).tar.gz
SOURCE32 = http://ftp.4players.de/pub/hosted/ts3/releases/$(VERSION)/teamspeak3-server_linux-x86-$(VERSION).tar.gz SOURCE32 = http://ftp.4players.de/pub/hosted/ts3/releases/$(VERSION)/teamspeak3-server_linux-x86-$(VERSION).tar.gz

9
teamspeak/templates/teamspeak.init.erb → teamspeak/files/teamspeak.init
View file

@ -8,13 +8,14 @@
. /etc/rc.d/init.d/functions . /etc/rc.d/init.d/functions
RETVAL=0 RETVAL=0
PROG="<%= @teamspeak_bin %>" PROG="/usr/local/teamspeak/ts3server"
ARGS="inifile=ts3server.ini" ARGS="inifile=ts3server.ini >/dev/null 2>&1 &"
start() { start() {
echo -n "Starting TeamSpeak server: " echo -n "Starting TeamSpeak server: "
export LD_LIBRARY_PATH="/usr/local/teamspeak" cd /srv/teamspeak || return 1
daemon --user teamspeak "cd /srv/teamspeak ; $PROG $ARGS >/dev/null &" export LD_LIBRARY_PATH="`dirname $PROG`"
daemon --user teamspeak $PROG "$ARGS"
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/teamspeak [ $RETVAL -eq 0 ] && touch /var/lock/subsys/teamspeak

12
teamspeak/manifests/init.pp
View file

@ -86,12 +86,12 @@ class teamspeak($package=undef, $license=undef) {
} }
file { "/etc/init.d/teamspeak": file { "/etc/init.d/teamspeak":
ensure => present, ensure => present,
mode => "0755", mode => "0755",
owner => "root", owner => "root",
group => "root", group => "root",
content => template("teamspeak/teamspeak.init.erb"), source => "puppet:///modules/teamspeak/teamspeak.init",
notify => Exec["add-service-teamspeak"], notify => Exec["add-service-teamspeak"],
} }
exec { "add-service-teamspeak": exec { "add-service-teamspeak":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",