Small mods to vhost configuration and installer.

Author: tbrehm

install/lib/installer_base.lib.php

@@ -611,7 +611,7 @@ public function configure_apache()
 		exec('mkdir -p /var/log/ispconfig/httpd');
 
 		if(is_file('/etc/suphp/suphp.conf')) {
-			replaceLine('/etc/suphp/suphp.conf','application/x-httpd-php=php:/usr/bin/php-cgi','x-httpd-suphp=php:/usr/bin/php-cgi',0);
+			replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin/php-cgi','x-httpd-suphp=php:/usr/bin/php-cgi',0);
 			replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
 		}
 

server/conf/vhost.conf.master

@@ -49,12 +49,12 @@
 </tmpl_if>
 <tmpl_if name='php' op='==' value='suphp'>
     <Directory {tmpl_var name='web_document_root'}>
-    # suphp enabled
-    suPHP_Engine on
-    # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
-    AddHandler x-httpd-suphp .php .php3 .php4 .php5
-    suPHP_AddHandler x-httpd-suphp
-	</Directory>
+        # suphp enabled
+        suPHP_Engine on
+        # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+        AddHandler x-httpd-suphp .php .php3 .php4 .php5
+        suPHP_AddHandler x-httpd-suphp
+    </Directory>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='cgi'>
     # php as cgi enabled