Updated version number to 3.0.2.2

tbrehm

2010-06-10 d46d3709a227915f8649bca7f4162ff66a83da41

 install/install.php

@@ -55,7 +55,9 @@

//** Ensure that current working directory is install directory
$cur_dir = getcwd();
if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
if(realpath(dirname(__FILE__)) != $cur_dir) {
   chdir( realpath(dirname(__FILE__)) );
}

//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
@@ -91,6 +93,10 @@

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

if(is_dir('/usr/local/ispconfig')) {
   die('ISPConfig 3 installation found. Please use update.php instead if install.php to update the installation.');
}

//** Detect the installed applications
@@ -160,18 +166,24 @@
   //* Configure jailkit
   swriteln('Configuring Jailkit');
   $inst->configure_jailkit();
	
   if($conf['dovecot']['installed'] == true) {
      //* Configure dovecot
      swriteln('Configuring Dovecot');
      $inst->configure_dovecot();
   } else {
      //* Configure saslauthd
      swriteln('Configuring SASL');
      $inst->configure_saslauthd();

   //* Configure saslauthd
   swriteln('Configuring SASL');
   $inst->configure_saslauthd();

   //* Configure PAM
   swriteln('Configuring PAM');
   $inst->configure_pam();

   //* Configure courier
   swriteln('Configuring Courier');
   $inst->configure_courier();
      //* Configure PAM
      swriteln('Configuring PAM');
      $inst->configure_pam();
		
      //* Configure courier
      swriteln('Configuring Courier');
      $inst->configure_courier();
   }

   //* Configure Spamasassin
   swriteln('Configuring Spamassassin');
@@ -194,6 +206,9 @@
   if($conf['powerdns']['installed'] == true) {
      swriteln('Configuring PowerDNS');
      $inst->configure_powerdns();
   } elseif($conf['bind']['installed'] == true) {
      swriteln('Configuring BIND');
      $inst->configure_bind();
   } else {
      swriteln('Configuring MyDNS');
      $inst->configure_mydns();
@@ -206,6 +221,10 @@
    //** Configure vlogger
    swriteln('Configuring vlogger');
    $inst->configure_vlogger();
	
   //** Configure apps vhost
   swriteln('Configuring Apps vhost');
   $inst->configure_apps_vhost();
    
   //* Configure Firewall
   swriteln('Configuring Firewall');
@@ -228,20 +247,22 @@
   $inst->install_crontab();
   
   swriteln('Restarting services ...');
   if($conf['mysql']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   if($conf['postfix']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['postfix']['init_script']))            system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   if($conf['saslauthd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
   if($conf['amavis']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['amavis']['init_script']))               system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
   if($conf['clamav']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['clamav']['init_script']))               system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
   if($conf['courier']['courier-authdaemon'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
   if($conf['courier']['courier-imap'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))          system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
   if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))    system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
   if($conf['courier']['courier-pop'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   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['pureftpd']['init_script'] != '' && is_file($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_file($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_file($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))               system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
   if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['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['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['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');
   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');
   
}else{
   
@@ -309,18 +330,25 @@
      //* Configure Postfix
      swriteln('Configuring Postfix');
      $inst->configure_postfix();
		
      //* Configure saslauthd
      swriteln('Configuring SASL');
      $inst->configure_saslauthd();
		
      //* Configure PAM
      swriteln('Configuring PAM');
      $inst->configure_pam();

      //* Configure courier
      swriteln('Configuring Courier');
      $inst->configure_courier();
      if($conf['dovecot']['installed'] == true) {
         //* Configure dovecot
         swriteln('Configuring Dovecot');
         $inst->configure_dovecot();
      } else {
		
         //* Configure saslauthd
         swriteln('Configuring SASL');
         $inst->configure_saslauthd();
		
         //* Configure PAM
         swriteln('Configuring PAM');
         $inst->configure_pam();
			
         //* Configure courier
         swriteln('Configuring Courier');
         $inst->configure_courier();
      }

      //* Configure Spamasassin
      swriteln('Configuring Spamassassin');
@@ -343,6 +371,7 @@
      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');
   }
   
   //** Configure Jailkit
@@ -366,6 +395,10 @@
         swriteln('Configuring PowerDNS');
         $inst->configure_powerdns();
         if($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');
      } else {
         swriteln('Configuring MyDNS');
         $inst->configure_mydns();
@@ -384,6 +417,10 @@
        //** Configure vlogger
        swriteln('Configuring vlogger');
        $inst->configure_vlogger();
		
      //** Configure apps vhost
      swriteln('Configuring Apps vhost');
      $inst->configure_apps_vhost();
   }
   
   //** Configure Firewall