From 03e1700a01dd3b425ec5d6cb7bd9684360900a53 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 07 Jun 2012 06:59:07 -0400
Subject: [PATCH] FS#1814 - Add option for custom php.ini for execution of ispconfig server.php script

---
 server/server.sh     |    7 +++++++
 server/cron_daily.sh |    7 +++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/server/cron_daily.sh b/server/cron_daily.sh
index e2fbb9b..717b943 100644
--- a/server/cron_daily.sh
+++ b/server/cron_daily.sh
@@ -2,4 +2,11 @@
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 
+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
+
 /usr/bin/php -q /usr/local/ispconfig/server/cron_daily.php
diff --git a/server/server.sh b/server/server.sh
index 86adc00..c6f9611 100755
--- a/server/server.sh
+++ b/server/server.sh
@@ -4,5 +4,12 @@
 
 . /etc/profile
 
+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