Merge branch 'patch-1' into 'stable-3.1'
Added missing quotation mark in search value.
Keeps overwriting custom path.
I'm running Ubuntu 16.04 and has changed
x-httpd-suphp="php:/usr/bin/php-cgi"
To
x-httpd-suphp="php:/usr/bin/php-cgi5.6"
And when i update ispconfig it keeps adding this to the end of the file
x-httpd-suphp="php:/usr/bin/php-cgi"
See merge request !358
| | |
| | | if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true); |
| | | |
| | | if(is_file('/etc/suphp/suphp.conf')) { |
| | | replaceLine('/etc/suphp/suphp.conf', 'php=php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0); |
| | | replaceLine('/etc/suphp/suphp.conf', 'php="php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0); |
| | | //replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0); |
| | | replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0); |
| | | } |