From 8603b4abde47d11ce9900166cd38ed8f46dc11d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 19 May 2015 09:38:34 -0400
Subject: [PATCH] Merge branch 'feature/independent-php' into 'master'
---
server/server.sh | 12 ++++++++++--
server/scripts/update_from_dev.sh | 6 +++++-
server/cron.sh | 6 +++++-
install/tpl/apache_apps_fcgi_starter.master | 6 +++++-
install/tpl/apache_ispconfig_fcgi_starter.master | 7 ++++++-
server/scripts/ispconfig_update.sh | 6 +++++-
server/scripts/update_from_tgz.sh | 6 +++++-
7 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/install/tpl/apache_apps_fcgi_starter.master b/install/tpl/apache_apps_fcgi_starter.master
index 8a26441..8ef1cbb 100644
--- a/install/tpl/apache_apps_fcgi_starter.master
+++ b/install/tpl/apache_apps_fcgi_starter.master
@@ -3,4 +3,8 @@
export PHPRC
export PHP_FCGI_MAX_REQUESTS=5000
export PHP_FCGI_CHILDREN=1
-exec {fastcgi_bin} -d magic_quotes_gpc=off
\ No newline at end of file
+exec {fastcgi_bin} -d \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d magic_quotes_gpc=off \
+ -d open_basedir=
diff --git a/install/tpl/apache_ispconfig_fcgi_starter.master b/install/tpl/apache_ispconfig_fcgi_starter.master
index 240fccc..ab7d13f 100644
--- a/install/tpl/apache_ispconfig_fcgi_starter.master
+++ b/install/tpl/apache_ispconfig_fcgi_starter.master
@@ -3,4 +3,9 @@
export PHPRC
export PHP_FCGI_MAX_REQUESTS=5000
export PHP_FCGI_CHILDREN=1
-exec {fastcgi_bin} -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/interface/temp
\ No newline at end of file
+exec {fastcgi_bin} \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d magic_quotes_gpc=off \
+ -d open_basedir= \
+ -d session.save_path=/usr/local/ispconfig/interface/temp
diff --git a/server/cron.sh b/server/cron.sh
index 4aff859..3670e68 100644
--- a/server/cron.sh
+++ b/server/cron.sh
@@ -10,4 +10,8 @@
fi
cd /usr/local/ispconfig/server
-/usr/bin/php -q /usr/local/ispconfig/server/cron.php
+/usr/bin/php -q \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d open_basedir= \
+ /usr/local/ispconfig/server/cron.php
diff --git a/server/scripts/ispconfig_update.sh b/server/scripts/ispconfig_update.sh
index e3689cf..03c13c9 100644
--- a/server/scripts/ispconfig_update.sh
+++ b/server/scripts/ispconfig_update.sh
@@ -1,3 +1,7 @@
#!/bin/bash
-php -q /usr/local/ispconfig/server/scripts/ispconfig_update.php
\ No newline at end of file
+php -q \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d open_basedir= \
+ /usr/local/ispconfig/server/scripts/ispconfig_update.php
diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh
index de93fd9..12f62aa 100644
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -4,7 +4,11 @@
wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
tar xzf ispconfig3-dev.tar.gz
cd ispconfig3.git/install
-php -q update.php
+php -q \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d open_basedir= \
+ update.php
cd /tmp
rm -rf /tmp/ispconfig3.git /tmp/ispconfig3-dev.tar.gz
diff --git a/server/scripts/update_from_tgz.sh b/server/scripts/update_from_tgz.sh
index 09dddeb..7d59e40 100644
--- a/server/scripts/update_from_tgz.sh
+++ b/server/scripts/update_from_tgz.sh
@@ -12,7 +12,11 @@
then
tar xvfz ISPConfig-3-stable.tar.gz
cd ispconfig3_install/install/
- php -q update.php
+ php -q \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d open_basedir= \
+ update.php
rm -rf /tmp/ispconfig3_install/install
rm -f ISPConfig-3-stable.tar.gz
else
diff --git a/server/server.sh b/server/server.sh
index 2f3d2fb..2d05d4f 100755
--- a/server/server.sh
+++ b/server/server.sh
@@ -15,7 +15,15 @@
fi
cd /usr/local/ispconfig/server
-/usr/bin/php -q /usr/local/ispconfig/server/server.php
+/usr/bin/php -q \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d open_basedir= \
+ /usr/local/ispconfig/server/server.php
cd /usr/local/ispconfig/security
-/usr/bin/php -q /usr/local/ispconfig/security/check.php
+/usr/bin/php -q \
+ -d disable_classes= \
+ -d disable_functions= \
+ -d open_basedir= \
+ /usr/local/ispconfig/security/check.php
--
Gitblit v1.9.1