From a4f044fe21452b1a9e2f30863393fa843f0d9c3b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 13 Jul 2009 08:04:52 -0400
Subject: [PATCH] Fixed: FS#813 - umask in suphp.conf should be 0022

---
 install/lib/installer_base.lib.php |    1 +
 install/dist/lib/fedora.lib.php    |    1 +
 install/dist/lib/opensuse.lib.php  |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 6dcf988..bd39de0 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -409,6 +409,7 @@
 		if(is_file('/etc/suphp.conf')) {
 			//replaceLine('/etc/suphp.conf','php=php:/usr/bin','x-httpd-suphp=php:/usr/bin/php-cgi',0);
 			replaceLine('/etc/suphp.conf','docroot=','docroot=/var/www',0);
+			replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0);
 		}
 		
 		//* Create the logging directory for the vhost logfiles
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index bb3cfab..ae5dc76 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -432,6 +432,7 @@
 		//if(is_file('/etc/suphp.conf')) {
 		replaceLine('/etc/suphp.conf','php=php','x-httpd-suphp=php:/srv/www/cgi-bin/php5',0,0);
 		replaceLine('/etc/suphp.conf','docroot=','docroot=/srv/www',0,0);
+		replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0);
 		//}
 		
 		// Sites enabled and avaulable dirs
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 28bf4ae..3ea0894 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -778,6 +778,7 @@
 		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);
 		}
 		
 		if(is_file('/etc/apache2/sites-enabled/000-default')) {

--
Gitblit v1.9.1