From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
install/install.php | 258 +++++++++++++++++++++++++++++++-------------------
1 files changed, 159 insertions(+), 99 deletions(-)
diff --git a/install/install.php b/install/install.php
index 8f4bf5c..3138ee5 100644
--- a/install/install.php
+++ b/install/install.php
@@ -32,222 +32,282 @@
ISPConfig 3 installer.
*/
-// Check for existing installation
+//** 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);
-// Include the library with the basic installer functions
+//** The banner on the command line
+echo "\n\n".str_repeat('-',80)."\n";
+echo " _____ ___________ _____ __ _
+|_ _/ ___| ___ \ / __ \ / _(_)
+ | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _
+ | | `--. \ __/ | | / _ \| '_ \| _| |/ _` |
+ _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| |
+ \___/\____/\_| \____/\___/|_| |_|_| |_|\__, |
+ __/ |
+ |___/ ";
+echo "\n".str_repeat('-',80)."\n";
+echo "\n\n>> Initial configuration \n\n";
+
+//** Include the library with the basic installer functions
require_once('lib/install.lib.php');
-// Include the base class of the installer class
+//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');
-include_once('options.conf.php');
+//** Get distribution identifier
$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');
+if($distname == '') die('Linux Dustribution or Version not recognized.');
-$conf['dist'] = $dist;
+//** 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');
+
+//****************************************************************************************************
+//** 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>.'));
+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(dirname(ISPC_LOG_FILE))){
+ die("ERROR: Cannot write to the directory ".dirname(ISPC_LOG_FILE).". Are you root or sudo ?\n\n");
+}
+
+if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
+ die('This software can not be installed on a server wich runs ISPConfig 2.x.');
+}
+
+//** 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');
-
-swriteln($inst->lng("This application will install ISPConfig 3 on your server."));
-
-// 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
+//** Get the hostname
$tmp_out = array();
-exec("hostname -f",$tmp_out);
-$conf["hostname"] = $inst->free_query('Full qualified hostname (FQDN) of the server',$tmp_out[0]);
+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]);
unset($tmp_out);
-
-
-// Get MySQL root password
+//** Get MySQL root credentials
$finished = false;
do {
- $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_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
+ //* 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']['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());
+ swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
}
} while ($finished == false);
unset($finished);
-// initializing database connection
+//** initializing database connection
include_once('lib/mysql.lib.php');
$inst->db = new db();
-// Begin with standard or expert installation
+//** Begin with standard or expert installation
if($install_mode == 'Standard') {
- // Create the mysql database
+ //* Create the mysql database
$inst->configure_database();
+
+ //* Insert the Server record into the database
+ $inst->add_database_server_record();
- // Configure postfix
+ //* Configure postfix
$inst->configure_postfix();
+
+ //* Configure postfix
+ swriteln('Configuring Jailkit');
+ $inst->configure_jailkit();
- // Configure saslauthd
+ //* Configure saslauthd
swriteln('Configuring SASL');
$inst->configure_saslauthd();
- // Configure PAM
+ //* Configure PAM
swriteln('Configuring PAM');
$inst->configure_pam();
- // Configure courier
+ //* Configure courier
swriteln('Configuring Courier');
$inst->configure_courier();
- // Configure Spamasassin
+ //* Configure Spamasassin
swriteln('Configuring Spamassassin');
$inst->configure_spamassassin();
- // Configure Amavis
+ //* Configure Amavis
swriteln('Configuring Amavisd');
$inst->configure_amavis();
- // Configure Getmail
+ //* Configure Getmail
swriteln('Configuring Getmail');
$inst->configure_getmail();
- // Configure Pureftpd
+ //* Configure Pureftpd
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
- // Configure MyDNS
+ //* Configure MyDNS
swriteln('Configuring MyDNS');
$inst->configure_mydns();
- // Configure Apache
+ //* Configure Apache
swriteln('Configuring Apache');
$inst->configure_apache();
- // Configure ISPConfig
+ //* Configure ISPConfig
swriteln('Installing ISPConfig');
+
+ //** Customise the port ISPConfig runs on
+ $inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+
$inst->install_ispconfig();
- // Configure ISPConfig
+ //* Configure ISPConfig
swriteln('Installing Crontab');
$inst->install_crontab();
swriteln('Restarting services ...');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['mysql']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['postfix']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['amavis']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['clamav']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['apache']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['mydns']['init_script'].' restart');
+ 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');
-} else {
+}else{
+
+ //** Get Server ID
+ // $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
+ // Server ID is an autoInc value of the mysql database now
- // Get Server ID
- $conf["server_id"] = $inst->free_query('Unique Numeric ID of the server','1');
-
- if(strtolower($inst->simple_query('Create Database',array('y','n'),'y')) == 'y') {
- // Create the mysql database
+ if(strtolower($inst->simple_query('Shall this server join a existing ISPConfig installation? If not, we will create a new database now',array('y','n'),'y')) == 'n') {
+ //* Create the mysql database
$inst->configure_database();
- system("/etc/init.d/mysql restart");
+ system('/etc/init.d/mysql restart');
}
-
- if(strtolower($inst->simple_query('Configure Mail',array('y','n'),'y')) == 'y') {
- // Configure Postfix
+ //* Insert the Server record into the database
+ $inst->add_database_server_record();
+
+
+ if(strtolower($inst->simple_query('Configure Mail', array('y','n') ,'y') ) == 'y') {
+
+ //* Configure Postfix
swriteln('Configuring Postfix');
$inst->configure_postfix();
- // Configure PAM
+ //* Configure PAM
swriteln('Configuring PAM');
$inst->configure_pam();
- // Configure courier
+ //* Configure courier
swriteln('Configuring Courier');
$inst->configure_courier();
- // Configure Spamasassin
+ //* Configure Spamasassin
swriteln('Configuring Spamassassin');
$inst->configure_spamassassin();
- // Configure Amavis
+ //* Configure Amavis
swriteln('Configuring Amavisd');
$inst->configure_amavis();
- // Configure Getmail
+ //* Configure Getmail
swriteln('Configuring Getmail');
$inst->configure_getmail();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['postfix']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['amavis']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['clamav']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop-ssl'].' 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');
}
- if(strtolower($inst->simple_query('Configure FTP Server',array('y','n'),'y')) == 'y') {
- // Configure Pureftpd
+ //** Configure Pureftpd
+ if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
+ system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
}
+ //** Configure MyDNS
if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
- // Configure MyDNS
swriteln('Configuring MyDNS');
$inst->configure_mydns();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['mydns']['init_script'].' restart');
+ system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
}
- if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
- // Configure Apache
+ //** Configure Apache
+ if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
swriteln('Configuring Apache');
$inst->configure_apache();
}
+ //** Configure ISPConfig :-)
if(strtolower($inst->simple_query('Install ISPConfig',array('y','n'),'y')) == 'y') {
- // Configure ISPConfig
swriteln('Installing ISPConfig');
- $inst->install_ispconfig();
+
+ //** We want to check if the server is a module or cgi based php enabled server
+ //** TODO: Don't always ask for this somehow ?
+ $fast_cgi = $inst->simple_query('CGI PHP Enabled Server?', array('yes','no'),'no');
- // Configure ISPConfig
+ 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);
+ } else {
+ $inst->conf['apache']['vhost_cgi_alias'] = "";
+ }
+
+ //** Customise the port ISPConfig runs on
+ $inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+
+
+ $inst->install_ispconfig();
+
+ //* Configure ISPConfig
swriteln('Installing Crontab');
$inst->install_crontab();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['apache']['init_script'].' restart');
+ system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
}
-
-}
+} //* << $install_mode / 'Standard' or Genius
-echo "Installation finished.\n";
+echo "Installation completed.\n";
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1