From 8cf955c1e06bd450342fbf742da4d2031646f23a Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 29 Sep 2011 12:50:17 +0000 Subject: [PATCH] Fixed: Vserver enabled on servers where openvz is not installed. --- install/install.php | 5 +++-- install/lib/installer_base.lib.php | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/install/install.php b/install/install.php index 4a04ec3ad..a31efbce0 100644 --- a/install/install.php +++ b/install/install.php @@ -531,17 +531,18 @@ if($install_mode == 'standard') { //** Configure Firewall if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') { - if($conf['bastille']['installed'] == true) { + //if($conf['bastille']['installed'] == true) { //* Configure Bastille Firewall $conf['services']['firewall'] = true; swriteln('Configuring Bastille Firewall'); $inst->configure_firewall(); - } elseif($conf['ufw']['installed'] == true) { + /*} elseif($conf['ufw']['installed'] == true) { //* Configure Ubuntu Firewall $conf['services']['firewall'] = true; swriteln('Configuring Ubuntu Firewall'); $inst->configure_ufw_firewall(); } + */ } //** Configure Firewall diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index fcd8673f6..a4ec514db 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1683,14 +1683,10 @@ class installer_base { $dns_server_enabled = ($conf['services']['dns'])?1:0; $file_server_enabled = ($conf['services']['file'])?1:0; $db_server_enabled = ($conf['services']['db'])?1:0; - $vserver_server_enabled = ($conf['services']['vserver'])?1:0; + $vserver_server_enabled = ($conf['openvz']['installed'])?1:0; $proxy_server_enabled = ($conf['services']['proxy'])?1:0; $firewall_server_enabled = ($conf['services']['firewall'])?1:0; - - - - $sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled' WHERE server_id = ".intval($conf['server_id']); if($conf['mysql']['master_slave_setup'] == 'y') { -- GitLab