From e7ae4ef2c82ec1d22fec6ae4f0dbdc8e6afd73e9 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 22 Apr 2016 01:30:58 -0400
Subject: [PATCH] comment mongodb

---
 install/install.php |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/install/install.php b/install/install.php
index 1c413f9..374edd7 100644
--- a/install/install.php
+++ b/install/install.php
@@ -208,7 +208,7 @@
 	}
 
 	//* Initialize the MySQL server connection
-	if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
+	if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, '', (int)$tmp_mysql_server_port)) {
 		$conf['mysql']['host'] = $tmp_mysql_server_host;
 		$conf['mysql']['port'] = $tmp_mysql_server_port;
 		$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
@@ -328,17 +328,20 @@
 	} else swriteln('[ERROR] Postfix not installed - skipping Mail');
 
 	//* Check for DNS
-	if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
-		$conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
+//	if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
+	if(!$conf['bind']['installed'] && !$conf['mydns']['installed']) {
+//		$conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
 		$conf['bind']['installed'] = $inst->force_configure_app('BIND', false);
 		$conf['mydns']['installed'] = $inst->force_configure_app('MyDNS', false);
 	}
 	//* Configure PowerDNS
+/*
 	if($conf['powerdns']['installed']) {
 		swriteln('Configuring PowerDNS');
 		$inst->configure_powerdns();
 		$conf['services']['dns'] = true;
 	}
+*/
 	//* Configure Bind
 	if($conf['bind']['installed']) {
 		swriteln('Configuring BIND');
@@ -445,6 +448,7 @@
 		swriteln('Configuring Bastille Firewall');
 		$inst->configure_bastille_firewall();
 		$conf['services']['firewall'] = true;
+		$conf['bastille']['installed'] = true;
 	}
 
 	//* Configure Fail2ban
@@ -702,9 +706,6 @@
 		$inst->configure_pureftpd();
 	}
 	
-	swriteln('Detect IP addresses');
-	$inst->detect_ips();
-
 	//** Configure DNS
 	if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y','configure_dns')) == 'y') {
 		$conf['services']['dns'] = true;

--
Gitblit v1.9.1