added css styles

redray

2008-10-26 c9985b0ae4a57fc3d852d9fa16ce7cc910bd63be

 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');
@@ -175,14 +180,22 @@
   //* Configure Apache
   swriteln('Configuring Apache');
   $inst->configure_apache();
	
   //* Configure Firewall
   swriteln('Configuring Firewall');
   $inst->configure_firewall();

   //* Configure ISPConfig
   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();
	
   //* Configure DBServer
   swriteln('Configuring DBServer');
   $inst->configure_dbserver();

   //* Configure ISPConfig
   swriteln('Installing Crontab');
@@ -201,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{

@@ -212,11 +225,12 @@
   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
   swriteln('Adding ISPConfig server record to database.');
   swriteln('');
   $inst->add_database_server_record();

   
@@ -277,8 +291,14 @@
      $inst->configure_apache();
   }
   
   //** Configure Firewall
   if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {	
      swriteln('Configuring Firewall');
      $inst->configure_firewall();
   }
	
   //** Configure ISPConfig :-)
   if(strtolower($inst->simple_query('Install ISPConfig',array('y','n'),'y')) == 'y') {
   if(strtolower($inst->simple_query('Install ISPConfig Web-Interface',array('y','n'),'y')) == 'y') {
      swriteln('Installing ISPConfig');
      
      //** We want to check if the server is a module or cgi based php enabled server
@@ -289,24 +309,34 @@
      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();
		
      //* Configure ISPConfig
      swriteln('Installing Crontab');
      $inst->install_crontab();
      system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');	
      $inst->install_ispconfig_interface = true;
			
   } else {
      $inst->install_ispconfig_interface = false;
   }
   
   $inst->install_ispconfig();
	
   //* Configure DBServer
   swriteln('Configuring DBServer');
   $inst->configure_dbserver();
		
   //* Configure ISPConfig
   swriteln('Installing Crontab');
   $inst->install_crontab();
   system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
	
	
	
} //* << $install_mode / 'Standard' or Genius