Merged revisions 2794-2804 from stable branch.

tbrehm

2011-12-07 6882ab1634ec66e621e8964428f741cd7d103a00

 server/server.sh

@@ -4,23 +4,5 @@

. /etc/profile

if [ -f /tmp/ispconfig3_install/install/autoupdate ]; then
   #
   # there is a auto-update waiting for update, so let's do it
   #
   cd /tmp/ispconfig3_install/install
   /usr/bin/php -q autoupdate.php	
   cd /

   #
   # do some clean-up
   #
   rm /tmp/ispconfig3_install -R

else
   # 
   # there is no update waiting, so lets start the ISPConfig-System
   #
   cd /usr/local/ispconfig/server
   /usr/bin/php -q /usr/local/ispconfig/server/server.php
fi
cd /usr/local/ispconfig/server
/usr/bin/php -q /usr/local/ispconfig/server/server.php