From dcff5718f345f55f7ea81f18d1f086facde4eacf Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Mon, 20 Aug 2007 23:14:51 -0400
Subject: [PATCH] * Using new ISPC_*_PATH constants * Adding new data schema (to be moved shortly * no more $conf['classpath']
---
install/install.php | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/install/install.php b/install/install.php
index 8228971..134f62d 100644
--- a/install/install.php
+++ b/install/install.php
@@ -52,30 +52,42 @@
//** Include the library with the basic installer functions
require_once('lib/install.lib.php');
+require_once('options.conf.php');
+
//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');
-
-include_once('options.conf.php');
-$distname = get_distname();
//** Include the distribution specific installer class library and configuration
include_once('dist/lib/'.$conf['distname'].'.lib.php');
include_once('dist/conf/'.$conf['distname'].'.conf.php');
-//TODO: this is not there ????
+
+$distname = get_distname();
+//** Copt the $dist created in dist/conf/foo to global var
$conf['dist'] = $dist;
-//** Lets go !
+define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
+
+//****************************************************************************************************
+//** Installer Interface
+//****************************************************************************************************
$inst = new installer();
swriteln($inst->lng(' Following will be a few questions for primary configuration so be careful.'));
-swriteln($inst->lng(' Default values are in [brackets] and can be accepted with <ENTER>'."\n\n"));
+swriteln($inst->lng(' Default values are in [brackets] and can be accepted with <ENTER>.'));
+swriteln($inst->lng(' Tap in "quit" (without the quotes) to stop the installer.'."\n\n"));
+
+//** Check log file is writable (probably not root or sudo)
+if(!is_writable(ISPC_LOG_FILE)){
+ die("ERROR: Cannot write to the log file '".ISPC_LOG_FILE."'. Are you root or sudo ?\n\n");
+}
//** Select the language
$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
//** Select installation mode
$install_mode = $inst->simple_query('Installation mode', array('Standard','Expert'), 'Standard');
+
//** Get the hostname
$tmp_out = array();
@@ -89,12 +101,14 @@
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']);
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
+ $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
//* Initialize the MySQL server connection
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
$conf['mysql']['host'] = $tmp_mysql_server_host;
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
$conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password;
+ $conf['mysql']['database'] = $tmp_mysql_server_database;
$finished = true;
} else {
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
--
Gitblit v1.9.1