From 03e1700a01dd3b425ec5d6cb7bd9684360900a53 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 7 Jun 2012 10:59:07 +0000 Subject: [PATCH] FS#1814 - Add option for custom php.ini for execution of ispconfig server.php script --- server/cron_daily.sh | 7 +++++++ server/server.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/server/cron_daily.sh b/server/cron_daily.sh index e2fbb9b16..717b943d6 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 86adc0070..c6f9611c1 100755 --- a/server/server.sh +++ b/server/server.sh @@ -4,5 +4,12 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin . /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 -- GitLab