From ad955792a8ade5c0015aa3d68f86b1035c1acc31 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 22 Jan 2014 11:30:52 -0500
Subject: [PATCH] Fixed bug from previous commit

---
 server/server.sh |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/server/server.sh b/server/server.sh
index 2a6b2c4..75253e7 100755
--- a/server/server.sh
+++ b/server/server.sh
@@ -4,23 +4,14 @@
 
 . /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 /
+umask 022
 
-	#
-	# do some clean-up
-	#
-	rm /tmp/ispconfig3_install -R
+if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
+        PHPINIOWNER=`stat -c %U /usr/local/ispconfig/server/lib/php.ini`
+        if [ $PHPINIOWNER == 'root' ] || [ $PHPINIOWNER == 'ispconfig'  ]; then
+                export PHPRC=/usr/local/ispconfig/server/lib
+        fi
+fi
 
-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
\ No newline at end of file
+cd /usr/local/ispconfig/server
+/usr/bin/php -q /usr/local/ispconfig/server/server.php

--
Gitblit v1.9.1