teamspeak: Update server version, fix init script

teamspeak/Makefile

@@ -1,6 +1,6 @@
 include $(CURDIR)/../Makefile.inc
 
-VERSION = 3.0.10.1
+VERSION = 3.0.12.3
 
 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

teamspeak/files/teamspeak.init

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

teamspeak/manifests/init.pp

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