--- rpms/smeserver-teamspeak-server/contribs8/smeserver-teamspeak-server.spec	2013/03/08 19:14:54	1.2
+++ rpms/smeserver-teamspeak-server/contribs8/smeserver-teamspeak-server.spec	2013/03/08 22:00:38	1.3
@@ -1,9 +1,9 @@
-# $Id: smeserver-teamspeak-server.spec,v 1.1 2013/03/03 23:30:41 unnilennium Exp $
+# $Id: smeserver-teamspeak-server.spec,v 1.2 2013/03/08 19:14:54 unnilennium Exp $
 # Authority: cool34000
 # Name: Sylvain Gomez
 
 %define name smeserver-teamspeak-server
-%define version 3.0
+%define version 3.1
 %define release 0
 %define rpmver  4.0.4
 
@@ -31,6 +31,11 @@ http://your_e-smith-server_name:14534
 
 
 %changelog
+* Fri Mar 8 2013 JP Pialasse <tests@pialasse.com> 3.1-0
+- added back the web interface
+- added back templates
+- added default db values in tar
+ 
 * Fri Mar 8 2013 JP Pialasse <tests@pialasse.com> 3.0-0
 - change tarball to remove teamspeak binaries
 - some .spec cleanup, some more scripts have to be moved out there
@@ -63,22 +68,6 @@ http://your_e-smith-server_name:14534
 
 
 %build
-# Default DB parameters
-DEFAULTS1=root/etc/e-smith/db/configuration/defaults/teamspeak
-DEFAULTS2=root/etc/e-smith/db/accounts/defaults/teamspeak
-DEFAULTS3=root/etc/e-smith/db/configuration/defaults/tsweb
-DEFAULTS4=root/etc/e-smith/db/accounts/defaults/tsweb
-mkdir -p $DEFAULTS1
-mkdir -p $DEFAULTS2
-mkdir -p $DEFAULTS3
-mkdir -p $DEFAULTS4
-echo "public"   > $DEFAULTS1/access
-echo "enabled"  > $DEFAULTS1/status
-echo "service"  > $DEFAULTS1/type
-echo "8767"     > $DEFAULTS1/UDPPort
-echo "reserved" > $DEFAULTS2/type
-echo "url"      > $DEFAULTS3/type
-echo "reserved" > $DEFAULTS4/type
 
 
 %install
@@ -96,51 +85,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-# Adding teamspeak to SME's db
-/etc/e-smith/events/actions/initialize-default-databases
-echo " "
-
-# Variables
-SRVNAME=$(/sbin/e-smith/db configuration get SystemName)
-DOMAINNAME=$(/sbin/e-smith/db configuration get DomainName)
-TSPASS=$(/sbin/e-smith/db configuration getprop teamspeak UserPassword)
-
-#echo "Decompressing files..."
-#tar -xjf /usr/share/doc/teamspeak-server-2.0.24.1/Sources/ts2_server_rc2_202319.tar.bz2 -C /opt
-#mv -f /opt/tss2_rc2 /opt/teamspeak
-#cp -f /usr/share/doc/teamspeak-server-2.0.24.1/Sources/server_linux /opt/teamspeak/
-#rm -f /opt/teamspeak/teamspeak2-server_startscript
-
-#echo "Creating user teamspeak..."
-#useradd -M -c 'TeamSpeak Server' -d /opt/teamspeak teamspeak -s /bin/bash -p '$TSPASS'
-#chown -R root:teamspeak /opt/teamspeak
-#chmod 770 /opt/teamspeak
-#chmod 750 /opt/teamspeak/server_linux
-#chmod 750 /opt/teamspeak/sqlite_sql
-
-#echo "Creating service..."
-#ln -f -s /etc/rc.d/init.d/e-smith-service /etc/rc7.d/S98teamspeak
-#ln -f -s /etc/rc.d/init.d/e-smith-service /etc/rc6.d/K98teamspeak
-#/sbin/e-smith/signal-event remoteaccess-update
-
-#echo "Restarting Apache..."
-#/sbin/e-smith/expand-template /opt/tsweb/config.php
-#/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-#/etc/rc7.d/S86httpd-e-smith sigusr1
-
-#echo "Starting the daemon..."
-#/etc/rc7.d/S98teamspeak start
-
-#echo " "
-#echo "-------------------------------------------------------------------------------"
-#echo "TeamSpeak Server installation finished."
-#echo "You can access to the configuration page at: http://$SRVNAME:14534"
-#/etc/rc7.d/S98teamspeak passwords
-#echo " "
-#echo "The web page for teamspeak webusers: http://$DOMAINNAME/tsweb"
-#echo " "
-#/sbin/e-smith/config show teamspeak
-#echo "-------------------------------------------------------------------------------"
 
 
 %preun