From 08caf719829ee851e2dde692d7f0e7c2771fe41d Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sun, 09 Nov 2008 09:25:53 -0500
Subject: [PATCH] added icons to the lists
---
install/install.php | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/install/install.php b/install/install.php
index 2c82e7d..5f46d0a 100644
--- a/install/install.php
+++ b/install/install.php
@@ -57,13 +57,14 @@
require_once('lib/installer_base.lib.php');
//** Get distribution identifier
-$distname = get_distname();
+$dist = get_distname();
-if($distname == '') die('Linux Dustribution or Version not recognized.');
+if($dist['id'] == '') die('Linux Dustribution or Version not recognized.');
//** Include the distribution specific installer class library and configuration
-include_once('dist/lib/'.$distname.'.lib.php');
-include_once('dist/conf/'.$distname.'.conf.php');
+if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
+include_once('dist/lib/'.$dist['id'].'.lib.php');
+include_once('dist/conf/'.$dist['id'].'.conf.php');
//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
@@ -95,7 +96,7 @@
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
-$inst->conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
+$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
unset($tmp_out);
//** Get MySQL root credentials
@@ -118,6 +119,10 @@
}
} while ($finished == false);
unset($finished);
+
+// Resolve the IP address of the mysql hostname.
+if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);
+
//** initializing database connection
include_once('lib/mysql.lib.php');
@@ -184,7 +189,7 @@
swriteln('Installing ISPConfig');
//** Customise the port ISPConfig runs on
- $inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+ $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
$inst->install_ispconfig();
@@ -209,7 +214,7 @@
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
+ system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
}else{
@@ -220,7 +225,7 @@
if(strtolower($inst->simple_query('Create a new database? (We do not want to join a existing ISPConfig server setup)',array('y','n'),'y')) == 'y') {
//* Create the mysql database
$inst->configure_database();
- system('/etc/init.d/mysql restart');
+ //system('/etc/init.d/mysql restart');
}
//* Insert the Server record into the database
@@ -304,14 +309,14 @@
if($fast_cgi == 'yes') {
$alias = $inst->free_query('Script Alias', '/php/');
$path = $inst->free_query('Script Alias Path', '/path/to/cgi/bin');
- $inst->conf['apache']['vhost_cgi_alias'] = sprintf('ScriptAlias %s %s', $alias, $path);
+ $conf['apache']['vhost_cgi_alias'] = sprintf('ScriptAlias %s %s', $alias, $path);
} else {
- $inst->conf['apache']['vhost_cgi_alias'] = "";
+ $conf['apache']['vhost_cgi_alias'] = "";
}
*/
//** Customise the port ISPConfig runs on
- $inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+ $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
$inst->install_ispconfig_interface = true;
--
Gitblit v1.9.1