diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 24dd8feffaadd3f953cf0ed2a421f5fe0a234243..8706f5d2d0ed9f90b4d2eda216071fb1a4bbf593 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -404,6 +404,11 @@ class installer_dist extends installer_base { { global $conf; + 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/clients',0); + } + //* Create the logging directory for the vhost logfiles exec('mkdir -p /var/log/ispconfig/httpd'); diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index d3047f6dc93eb3f4f8a5fea8eb9f4671cf76aa65..98616ae8e4eefcc0a4c1fc06d9a1681176c2a888 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -702,8 +702,8 @@ class installer_base { } if(is_file('/etc/apache2/sites-enabled/000-default')) { - replaceLine('/etc/apache2/sites-available/000-default','NameVirtualHost *','NameVirtualHost *:80',1); - replaceLine('/etc/apache2/sites-available/000-default','<VirtualHost *>','<VirtualHost *:80>',1); + replaceLine('/etc/apache2/sites-available/000-default','NameVirtualHost *','NameVirtualHost *:80',1,0); + replaceLine('/etc/apache2/sites-available/000-default','<VirtualHost *>','<VirtualHost *:80>',1,0); } if(is_file('/etc/apache2/ports.conf')) {