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 ++++++--
install/lib/installer_base.lib.php | 2 +-
2 files changed, 7 insertions(+), 3 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
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 87533e6..3ad7bc9 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -333,7 +333,7 @@
$conf['server_id'] = $conf['server_id'];
//* Insert the same record in the local DB
- $sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (?,1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?, 0, 1, ?, ?, ?);";
+ $sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (?,1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?, ?, 0, 1, ?, ?, ?);";
$this->db->query($sql, $conf['server_id'], $conf['hostname'], $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $server_ini_content, $current_db_version, $proxy_server_enabled, $firewall_server_enabled);
//* username for the ispconfig user
--
Gitblit v1.9.1