From bedf79c47949b7d0cd3f07f46bb465c1e77fafe4 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sat, 11 Jul 2015 04:07:04 -0400
Subject: [PATCH] show warnings for missing services in the standard-setup instead of force_configure
---
install/lib/installer_base.lib.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3f54fc8..87533e6 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -164,13 +164,14 @@
if ($conf['services']['web'] && (($conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) || ($conf['nginx']['installed'] && is_file($conf['nginx']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")))) $this->ispconfig_interface_installed = true;
}
- public function force_configure_app($service) {
+ public function force_configure_app($service, $enable_force=true) {
$force = false;
swriteln("[WARN] autodetect for $service failed");
- if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
-// swriteln("Configure $service");
- $force = true;
- } else swriteln("Skipping $service\n");
+ if($enable_force) {
+ if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
+ $force = true;
+ } else swriteln("Skipping $service\n");
+ }
return $force;
}
--
Gitblit v1.9.1