last change didn't work: undo

redray

2008-12-01 386676a6ae702f5fbbd707fed7afbc65bfd89a3d

 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,18 +53,24 @@
//** Include the base class of the installer class
require_once('lib/installer_base.lib.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 Dustribution or Version not recognized.');
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');

//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');

//****************************************************************************************************
//** Installer Interface 
@@ -96,7 +99,7 @@
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
$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
@@ -106,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)) {
@@ -113,6 +117,7 @@
      $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());
@@ -140,7 +145,7 @@
   //* Configure postfix
   $inst->configure_postfix();
   
   //* Configure postfix
   //* Configure jailkit
   swriteln('Configuring Jailkit');
   $inst->configure_jailkit();

@@ -202,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 &> /dev/null');
   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{

@@ -260,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();
@@ -333,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');