Commit 8603b4ab authored by Marius Cramer's avatar Marius Cramer

Merge branch 'feature/independent-php' into 'master'

Ensure the internal PHP scripts work even if system-wide PHP settings are set

Another solution would be to reference the `php.ini` in `./server/lib` from all scripts...but maybe that's a bit of an overkill.

See: http://bugtracker.ispconfig.org/index.php?do=details&task_id=3293&project=3&string=php&type[0]=&sev[0]=&pri[0]=&due[0]=&reported[0]=&cat[0]=&status[0]=open&percent[0]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&pagenum=2

See merge request !188
parents 6e1f2d5a 4bc03097
......@@ -3,4 +3,8 @@ PHPRC={fastcgi_phpini_path}
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=
......@@ -3,4 +3,9 @@ PHPRC={fastcgi_phpini_path}
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
......@@ -10,4 +10,8 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
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
#!/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
......@@ -4,7 +4,11 @@ cd /tmp
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
......
......@@ -12,7 +12,11 @@ if [ -f ISPConfig-3-stable.tar.gz ]
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
......
......@@ -15,7 +15,15 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment