typo corrected

cfoe

2012-07-06 020a39d6ae8dd48c1132df42d36a74d6268d95e1

 install/install.php

@@ -92,7 +92,7 @@
}

if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
   die('This software can not be installed on a server wich runs ISPConfig 2.x.');
   die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
}

if(is_dir('/usr/local/ispconfig')) {
@@ -102,8 +102,12 @@
//** Detect the installed applications
$inst->find_installed_apps();

//** Select the language
//** Select the language and set default timezone
$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');

exec('date +%Z', $tmp_out);
$conf['timezone'] = $tmp_out[0];
unset($tmp_out);

//** Select installation mode
$install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard');
@@ -112,7 +116,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 server1.domain.tld ', $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);

// Check if the mysql functions are loaded in PHP
@@ -126,6 +130,12 @@
   $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']);
	
   if($install_mode == 'expert') {
      swriteln("The next two questions are about the internal ISPConfig database user and password.\nIt is recommended to accept the defaults which are 'ispconfig' as username and a random password.\nIf you use a different password, use only numbers and chars for the password.\n");
      $conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user']);
      $conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password']);
   }
   
   //* Initialize the MySQL server connection
   if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
@@ -157,11 +167,24 @@
   //* Create the MySQL database
   $inst->configure_database();
   
   //* Configure Webserver - Apache or nginx
   if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
      $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
      if($http_server_to_use == 'apache'){
         $conf['nginx']['installed'] = false;
      } else {
         $conf['apache']['installed'] = false;
      }
   }
	
   //* Insert the Server record into the database
   $inst->add_database_server_record();

   //* Configure Postfix
   $inst->configure_postfix();
	
   //* Configure Mailman
   $inst->configure_mailman('install');
   
   //* Configure jailkit
   swriteln('Configuring Jailkit');
@@ -197,7 +220,6 @@
   swriteln('Configuring Getmail');
   $inst->configure_getmail();
   

   //* Configure Pureftpd
   swriteln('Configuring Pureftpd');
   $inst->configure_pureftpd();
@@ -215,8 +237,16 @@
   }
   
   //* Configure Apache
   swriteln('Configuring Apache');
   $inst->configure_apache();
   if($conf['apache']['installed'] == true){
      swriteln('Configuring Apache');
      $inst->configure_apache();
   }
	
   //* Configure nginx
   if($conf['nginx']['installed'] == true){
      swriteln('Configuring nginx');
      $inst->configure_nginx();
   }
   
    //** Configure Vlogger
    swriteln('Configuring Vlogger');
@@ -227,14 +257,41 @@
   $inst->configure_apps_vhost();
    
   //* Configure Firewall
   swriteln('Configuring Firewall');
   //* Configure Bastille Firewall
   $conf['services']['firewall'] = true;
   swriteln('Configuring Bastille Firewall');
   $inst->configure_firewall();

    //* Configure Fail2ban
    if($conf['fail2ban']['installed'] == true) {
        swriteln('Configuring Fail2ban');
        $inst->configure_fail2ban();
    }
	
   /*
   if($conf['squid']['installed'] == true) {
      $conf['services']['proxy'] = true;
      swriteln('Configuring Squid');
      $inst->configure_squid();
   } else if($conf['nginx']['installed'] == true) {
      $conf['services']['proxy'] = true;
      swriteln('Configuring Nginx');
      $inst->configure_nginx();
   }
   */
	
   //* Configure ISPConfig
   swriteln('Installing ISPConfig');
   
   //** Customize the port ISPConfig runs on
   $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
   $ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
   if($conf['apache']['installed'] == true) $conf['apache']['vhost_port']  = $ispconfig_vhost_port;
   if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port']  = $ispconfig_vhost_port;
   unset($ispconfig_vhost_port);

   if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface',array('y','n'),'y')) == 'y') {
     $inst->make_ispconfig_ssl_cert();
   }

   $inst->install_ispconfig();
   
@@ -258,12 +315,20 @@
   if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
   if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script']))       system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
   if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   //* Reload is enough for nginx
   if($conf['nginx']['installed'] == true){
      if($conf['nginx']['php_fpm_init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'].' reload');
      if($conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))             system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
   }
   if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))            system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))               system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
   if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))               system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
   if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))               system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
	
   //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script']))               system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
   if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script']))               system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
   //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script']))               system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
}else{
   
   //* In expert mode, we select the services in the following steps, only db is always available
@@ -271,6 +336,8 @@
   $conf['services']['web'] = false;
   $conf['services']['dns'] = false;
   $conf['services']['db'] = true;
   $conf['services']['firewall'] = false;
   $conf['services']['proxy'] = false;
   
   
   //** Get Server ID
@@ -316,6 +383,16 @@
   
   //* Create the mysql database
   $inst->configure_database();
	
   //* Configure Webserver - Apache or nginx
   if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
      $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
      if($http_server_to_use == 'apache'){
         $conf['nginx']['installed'] = false;
      } else {
         $conf['apache']['installed'] = false;
      }
   }
      
   //* Insert the Server record into the database
   swriteln('Adding ISPConfig server record to database.');
@@ -330,6 +407,10 @@
      //* Configure Postfix
      swriteln('Configuring Postfix');
      $inst->configure_postfix();
		
      //* Configure Mailman
      swriteln('Configuring Mailman');
      $inst->configure_mailman();

      if($conf['dovecot']['installed'] == true) {
         //* Configure dovecot
@@ -362,16 +443,17 @@
      swriteln('Configuring Getmail');
      $inst->configure_getmail();
      
      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['dovecot']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
      if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))            system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
      if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
      if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script']))               system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
      if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script']))               system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
      if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
      if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))          system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
      if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))    system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
      if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
      if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
      if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
      if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script']))       system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
   }
   
   //** Configure Jailkit
@@ -384,7 +466,7 @@
   if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {   
      swriteln('Configuring Pureftpd');
      $inst->configure_pureftpd();
      if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
      if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   }
   
   //** Configure DNS
@@ -394,40 +476,93 @@
      if($conf['powerdns']['installed'] == true) {
         swriteln('Configuring PowerDNS');
         $inst->configure_powerdns();
         if($conf['powerdns']['init_script'] != '')   system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
         if($conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))               system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
      } elseif($conf['bind']['installed'] == true) {
         swriteln('Configuring BIND');
         $inst->configure_bind();
         if($conf['bind']['init_script'] != '')   system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
         if($conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))               system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
      } else {
         swriteln('Configuring MyDNS');
         $inst->configure_mydns();
         if($conf['mydns']['init_script'] != '')   system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
         if($conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))               system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
      }
      
   }
   
   /*
   //** Configure Squid
   if(strtolower($inst->simple_query('Configure Proxy Server', array('y','n'),'y') ) == 'y') {	
      if($conf['squid']['installed'] == true) {
         $conf['services']['proxy'] = true;
         swriteln('Configuring Squid');
         $inst->configure_squid();
         if($conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script']))system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
      } else if($conf['nginx']['installed'] == true) {
         $conf['services']['proxy'] = true;
         swriteln('Configuring Nginx');
         $inst->configure_nginx();
         if($conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
      }
   }
   */
	
   //** Configure Apache
   swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
   if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {	
      $conf['services']['web'] = true;
      swriteln('Configuring Apache');
      $inst->configure_apache();
        
        //** Configure Vlogger
        swriteln('Configuring Vlogger');
        $inst->configure_vlogger();
		
      //** Configure apps vhost
      swriteln('Configuring Apps vhost');
      $inst->configure_apps_vhost();
   if($conf['apache']['installed'] == true){
      swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
      if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {	
         $conf['services']['web'] = true;
         swriteln('Configuring Apache');
         $inst->configure_apache();
       
         //** Configure Vlogger
         swriteln('Configuring Vlogger');
         $inst->configure_vlogger();
	
         //** Configure apps vhost
         swriteln('Configuring Apps vhost');
         $inst->configure_apps_vhost();
      }
   }
	
   //** Configure nginx
   if($conf['nginx']['installed'] == true){
      swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure nginx Server' option.\n");
      if(strtolower($inst->simple_query('Configure nginx Server',array('y','n'),'y')) == 'y') {	
         $conf['services']['web'] = true;
         swriteln('Configuring nginx');
         $inst->configure_nginx();
       
         //** Configure Vlogger
         //swriteln('Configuring Vlogger');
         //$inst->configure_vlogger();
	
         //** Configure apps vhost
         swriteln('Configuring Apps vhost');
         $inst->configure_apps_vhost();
      }
   }
   
   //** Configure Firewall
   if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {   
      //if($conf['bastille']['installed'] == true) {
         //* Configure Bastille Firewall
         $conf['services']['firewall'] = true;
         swriteln('Configuring Bastille Firewall');
         $inst->configure_firewall();
      /*} elseif($conf['ufw']['installed'] == true) {
         //* Configure Ubuntu Firewall
         $conf['services']['firewall'] = true;
         swriteln('Configuring Ubuntu Firewall');
         $inst->configure_ufw_firewall();
      }
      */
   }
	
   //** 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 Web Interface',array('y','n'),'y')) == 'y') {
@@ -448,7 +583,10 @@
      */

      //** Customise the port ISPConfig runs on
      $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
      $ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
      if($conf['apache']['installed'] == true) $conf['apache']['vhost_port']  = $ispconfig_vhost_port;
      if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port']  = $ispconfig_vhost_port;
      unset($ispconfig_vhost_port);
      
      if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface',array('y','n'),'y')) == 'y') {
         $inst->make_ispconfig_ssl_cert();
@@ -469,7 +607,12 @@
   //* Configure ISPConfig
   swriteln('Installing ISPConfig crontab');
   $inst->install_crontab();
   if($conf['apache']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   //* Reload is enough for nginx
   if($conf['nginx']['installed'] == true){
      if($conf['nginx']['php_fpm_init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'].' reload');
      if($conf['nginx']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
   }
   
   
   
@@ -479,4 +622,4 @@
echo "Installation completed.\n";


?>
?>