From de7d2617421127b9cc7edeb3b17401246046714b Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 11 Apr 2016 04:00:39 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/install.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/install/install.php b/install/install.php
index b17336d..374edd7 100644
--- a/install/install.php
+++ b/install/install.php
@@ -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');
--
Gitblit v1.9.1