From 6eaaa70ea8ee9cd1044dbd101d6573d2e134d0f2 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Mon, 01 Dec 2008 05:19:20 -0500
Subject: [PATCH] added auto-revision from svn to version
---
install/install.php | 105 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 44 deletions(-)
diff --git a/install/install.php b/install/install.php
index 2c82e7d..0313d57 100644
--- a/install/install.php
+++ b/install/install.php
@@ -32,9 +32,6 @@
ISPConfig 3 installer.
*/
-//** Check for existing installation
-//if(is_dir("/usr/local/ispconfig")) die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.');
-
error_reporting(E_ALL|E_STRICT);
//** The banner on the command line
@@ -56,17 +53,24 @@
//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');
-//** Get distribution identifier
-$distname = get_distname();
-
-if($distname == '') 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');
-
//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
+define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
+
+//** Check for existing installation
+/*if(is_dir("/usr/local/ispconfig")) {
+ die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.');
+}*/
+
+//** Get distribution identifier
+$dist = get_distname();
+
+if($dist['id'] == '') die('Linux Distribution or Version not recognized.');
+
+//** Include the distribution specific installer class library and configuration
+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');
//****************************************************************************************************
//** Installer Interface
@@ -95,7 +99,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 server1.domain.tld ', $tmp_out[0]);
unset($tmp_out);
//** Get MySQL root credentials
@@ -105,6 +109,7 @@
$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']);
+ $tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']);
//* Initialize the MySQL server connection
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
@@ -112,12 +117,17 @@
$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;
+ $conf['mysql']['charset'] = $tmp_mysql_server_charset;
$finished = true;
} else {
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
}
} 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');
@@ -135,7 +145,7 @@
//* Configure postfix
$inst->configure_postfix();
- //* Configure postfix
+ //* Configure jailkit
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
@@ -184,7 +194,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();
@@ -197,19 +207,19 @@
$inst->install_crontab();
swriteln('Restarting services ...');
- system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
- 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');
+ if($conf['mysql']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+ if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+ if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+ if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+ if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+ if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+ if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+ if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+ if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+ if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+ if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+ if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
}else{
@@ -220,7 +230,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
@@ -255,32 +265,39 @@
swriteln('Configuring Getmail');
$inst->configure_getmail();
- system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+ if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+ if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+ if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+ if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+ if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+ if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+ if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+ if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ }
+
+ //** Configure Jailkit
+ if(strtolower($inst->simple_query('Configure Jailkit', array('y','n'),'y') ) == 'y') {
+ swriteln('Configuring Jailkit');
+ $inst->configure_jailkit();
}
//** Configure Pureftpd
if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
- system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+ if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
}
//** Configure MyDNS
if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
swriteln('Configuring MyDNS');
$inst->configure_mydns();
- system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
+ if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
}
//** Configure Apache
+ swriteln("If this server shall run the ispconfig interface, select 'y' in the next option.");
if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
swriteln('Configuring Apache');
$inst->configure_apache();
@@ -304,14 +321,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;
@@ -328,7 +345,7 @@
//* Configure ISPConfig
swriteln('Installing Crontab');
$inst->install_crontab();
- system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+ if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
--
Gitblit v1.9.1