Skip to content
Snippets Groups Projects
Commit 225c7a38 authored by Till Brehm's avatar Till Brehm
Browse files

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
parents f496e926 cd14a1d3
No related branches found
No related tags found
1 merge request!358Added missing quotation mark in search value.
...@@ -1691,7 +1691,7 @@ Email Address []: ...@@ -1691,7 +1691,7 @@ Email Address []:
if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true); if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
if(is_file('/etc/suphp/suphp.conf')) { 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','docroot=','docroot=/var/clients',0);
replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0); replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment