Skip to content

Commit 225c7a3

Browse files
author
Till Brehm
committed
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
2 parents f496e92 + cd14a1d commit 225c7a3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

install/lib/installer_base.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,7 @@ public function configure_apache() {
16911691
if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
16921692

16931693
if(is_file('/etc/suphp/suphp.conf')) {
1694-
replaceLine('/etc/suphp/suphp.conf', 'php=php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
1694+
replaceLine('/etc/suphp/suphp.conf', 'php="php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
16951695
//replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
16961696
replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0);
16971697
}

0 commit comments

Comments
 (0)