From 363cb9591d68e99169ff6d6a29f2e29daf16cd13 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 17 Aug 2015 05:35:13 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/install.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/install/install.php b/install/install.php
index a439672..7e916c1 100644
--- a/install/install.php
+++ b/install/install.php
@@ -755,8 +755,12 @@
}
}
- if($conf['openvz']['installed'] = true && strtolower($inst->simple_query('Enable Openvz-Server', array('y', 'n'), 'y','configure_openvz')) == 'y')
- $conf['services']['vserver'] = true;
+ //* Configure OpenVZ
+ $force = @($conf['openvz']['installed']) ? true : $inst->force_configure_app('OpenVZ');
+ if($force) {
+ $conf['services']['vserver'] = true;
+ swriteln('Configuring OpenVZ');
+ }
if(strtolower($inst->simple_query('Configure Firewall Server', array('y', 'n'), 'y','configure_firewall')) == 'y') {
//* Check for Firewall
--
Gitblit v1.9.1