From 80e3c9acf3fc9b6d15ea4fea7c89e0a2e12db412 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Tue, 26 Apr 2011 06:41:58 -0400 Subject: [PATCH] - Improved nginx reverse proxy support. - Added UFW firewall support. --- install/install.php | 67 +++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 5 deletions(-) diff --git a/install/install.php b/install/install.php index d79450f..ba2b087 100644 --- a/install/install.php +++ b/install/install.php @@ -230,9 +230,31 @@ $inst->configure_apps_vhost(); //* Configure Firewall - swriteln('Configuring Firewall'); - $inst->configure_firewall(); - + //swriteln('Configuring Firewall'); + //$inst->configure_firewall(); + //** Configure Firewall + if($conf['bastille']['installed'] == true) { + //* Configure Bastille Firewall + $conf['services']['firewall'] = true; + swriteln('Configuring Bastille Firewall'); + $inst->configure_firewall(); + } elseif($conf['ufw']['installed'] == true) { + //* Configure Ubuntu Firewall + $conf['services']['firewall'] = true; + swriteln('Configuring Ubuntu Firewall'); + $inst->configure_ufw_firewall(); + } + + if($conf['squid']['installed'] == true) { + $conf['services']['proxy'] = true; + swriteln('Configuring Squid'); + $inst->configure_squid(); + } else if($conf['nginx']['installed'] == true) { + $conf['services']['proxy'] = true; + swriteln('Configuring Nginx'); + $inst->configure_nginx(); + } + //* Configure ISPConfig swriteln('Installing ISPConfig'); @@ -267,7 +289,9 @@ if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null'); if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script'])) system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null'); if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null'); - + if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null'); + if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null'); + if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); }else{ //* In expert mode, we select the services in the following steps, only db is always available @@ -275,6 +299,8 @@ $conf['services']['web'] = false; $conf['services']['dns'] = false; $conf['services']['db'] = true; + $conf['services']['firewall'] = false; + $conf['services']['proxy'] = false; //** Get Server ID @@ -416,6 +442,21 @@ } + //** Configure Squid + if(strtolower($inst->simple_query('Configure Proxy Server', array('y','n'),'y') ) == 'y') { + if($conf['squid']['installed'] == true) { + $conf['services']['proxy'] = true; + swriteln('Configuring Squid'); + $inst->configure_squid(); + if($conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script']))system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null'); + } else if($conf['nginx']['installed'] == true) { + $conf['services']['proxy'] = true; + swriteln('Configuring Nginx'); + $inst->configure_nginx(); + if($conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null'); + } + } + //** Configure Apache swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n"); if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') { @@ -434,9 +475,25 @@ //** Configure Firewall if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') { + if($conf['bastille']['installed'] == true) { + //* Configure Bastille Firewall + $conf['services']['firewall'] = true; + swriteln('Configuring Bastille Firewall'); + $inst->configure_firewall(); + } elseif($conf['ufw']['installed'] == true) { + //* Configure Ubuntu Firewall + $conf['services']['firewall'] = true; + swriteln('Configuring Ubuntu Firewall'); + $inst->configure_ufw_firewall(); + } + } + + //** Configure Firewall + /*if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') { swriteln('Configuring Firewall'); $inst->configure_firewall(); - } + }*/ + //** Configure ISPConfig :-) if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),'y')) == 'y') { swriteln('Installing ISPConfig'); -- Gitblit v1.9.1