Merge remote-tracking branch 'ispc/master'

Marius Cramer

2015-05-21 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f

 server/server.sh

@@ -1,5 +1,6 @@
#!/bin/sh


PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin

. /etc/profile
@@ -14,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