Merge branch 'patch-4' into 'stable-3.1'

Till Brehm · Till Brehm · commit 49709c0c9d60 · 2016-07-26T12:57:43.000+02:00
Don't append umask=0022 if it already exists



See merge request !385
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1697,7 +1697,7 @@ public function configure_apache() {
 		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','docroot=','docroot=/var/clients',0);
-			replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0);
+			replaceLine('/etc/suphp/suphp.conf', 'umask=00', 'umask=0022', 0);
 		}
 
 		if(is_file('/etc/apache2/sites-enabled/000-default')) {

Original file line number	Diff line number	Diff line change
`@@ -1697,7 +1697,7 @@ public function configure_apache() {`
`1697`	`1697`	`if(is_file('/etc/suphp/suphp.conf')) {`
`1698`	`1698`	`replaceLine('/etc/suphp/suphp.conf', 'php="php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);`
`1699`	`1699`	`//replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);`
`1700`		`- replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0);`
	`1700`	`+ replaceLine('/etc/suphp/suphp.conf', 'umask=00', 'umask=0022', 0);`
`1701`	`1701`	`}`
`1702`	`1702`
`1703`	`1703`	`if(is_file('/etc/apache2/sites-enabled/000-default')) {`