From 10131039b1669f3bd4485ab71c33505de0dd377c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 05 May 2015 08:36:41 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/install.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/install/install.php b/install/install.php
index bdc33da..6bc198d 100644
--- a/install/install.php
+++ b/install/install.php
@@ -453,6 +453,7 @@
//** Customize the port ISPConfig runs on
$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
+ $conf['interface_password'] = $inst->free_query('Admin password', 'admin');
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
unset($ispconfig_vhost_port);
@@ -792,6 +793,7 @@
//** Customise the port ISPConfig runs on
$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
+ $conf['interface_password'] = $inst->free_query('Admin password', 'admin');
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
unset($ispconfig_vhost_port);
--
Gitblit v1.9.1