tbrehm
2010-02-24 3a94180e026d9353d13522e8d04cb15b11dc2bb2
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
@@ -168,10 +174,16 @@
   //* 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 courier
      swriteln('Configuring Courier');
      $inst->configure_courier();
   }
   //* Configure Spamasassin
   swriteln('Configuring Spamassassin');
@@ -245,6 +257,7 @@
   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['dovecot']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' 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');
@@ -326,9 +339,15 @@
      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 courier
         swriteln('Configuring Courier');
         $inst->configure_courier();
      }
      //* Configure Spamasassin
      swriteln('Configuring Spamassassin');
@@ -351,6 +370,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