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 |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/server.sh b/server/server.sh
old mode 100644
new mode 100755
index ddd0b38..75253e7
--- a/server/server.sh
+++ b/server/server.sh
@@ -1,5 +1,17 @@
-#!/bin/bash
+#!/bin/sh
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 
-/usr/bin/php -q /usr/local/ispconfig/server/server.php
\ No newline at end of file
+. /etc/profile
+
+umask 022
+
+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
+
+cd /usr/local/ispconfig/server
+/usr/bin/php -q /usr/local/ispconfig/server/server.php

--
Gitblit v1.9.1