From c719dc0b1dd696e0cd6b51f09ee13c8263375f7c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Sep 2011 05:57:38 -0400
Subject: [PATCH] Fixed a warning in maildrop plugin.
---
install/install.php | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/install/install.php b/install/install.php
index ba2b087..e2975c9 100644
--- a/install/install.php
+++ b/install/install.php
@@ -200,7 +200,6 @@
swriteln('Configuring Getmail');
$inst->configure_getmail();
-
//* Configure Pureftpd
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
@@ -230,20 +229,24 @@
$inst->configure_apps_vhost();
//* Configure Firewall
- //swriteln('Configuring Firewall');
- //$inst->configure_firewall();
//** Configure Firewall
- if($conf['bastille']['installed'] == true) {
+ if($conf['ufw']['installed'] == true) {
+ //* Configure UFW Firewall
+ $conf['services']['firewall'] = true;
+ swriteln('Configuring UFW Firewall');
+ $inst->configure_ufw_firewall();
+ } else {
//* 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 Fail2ban
+ if($conf['fail2ban']['installed'] == true) {
+ swriteln('Configuring Fail2ban');
+ $inst->configure_fail2ban();
+ }
if($conf['squid']['installed'] == true) {
$conf['services']['proxy'] = true;
@@ -260,6 +263,10 @@
//** Customize the port ISPConfig runs on
$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+
+ if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface',array('y','n'),'y')) == 'y') {
+ $inst->make_ispconfig_ssl_cert();
+ }
$inst->install_ispconfig();
@@ -544,4 +551,4 @@
echo "Installation completed.\n";
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1