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

Marius Cramer

2015-05-19 8603b4abde47d11ce9900166cd38ed8f46dc11d2

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

 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
exec {fastcgi_bin} -d  \
    -d disable_classes= \
    -d disable_functions= \
    -d magic_quotes_gpc=off \
    -d open_basedir=

 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
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

 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

 server/scripts/ispconfig_update.sh

@@ -1,3 +1,7 @@
#!/bin/bash

php -q /usr/local/ispconfig/server/scripts/ispconfig_update.php
php -q \
    -d disable_classes= \
    -d disable_functions= \
    -d open_basedir= \
    /usr/local/ispconfig/server/scripts/ispconfig_update.php

 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


 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

 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