Renamed website menu entries.

tbrehm

2010-01-22 dbbf2ea0a8c983969367c525dc939b03a33bb969

 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');
@@ -108,6 +110,9 @@
exec('hostname -f', $tmp_out);
$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
if(!function_exists('mysql_connect')) die('No PHP mysql functions available. Please ensure that the PHP mysql module is loaded.');

//** Get MySQL root credentials
$finished = false;
@@ -165,10 +170,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');
@@ -187,14 +198,30 @@
   swriteln('Configuring Pureftpd');
   $inst->configure_pureftpd();

   //* Configure MyDNS
   swriteln('Configuring MyDNS');
   $inst->configure_mydns();
   //* Configure DNS
   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();
   }
   
   //* Configure Apache
   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 Firewall
   swriteln('Configuring Firewall');
   $inst->configure_firewall();
@@ -226,9 +253,12 @@
   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']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mydns']['init_script']))               system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
   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['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['bind']['init_script']))               system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
   
}else{
   
@@ -305,9 +335,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');
@@ -330,6 +366,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
@@ -345,20 +382,40 @@
      if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   }
   
   //** Configure MyDNS
   //** Configure DNS
   if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
      $conf['services']['dns'] = true;
      swriteln('Configuring MyDNS');
      $inst->configure_mydns();
      if($conf['mydns']['init_script'] != '')   system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
      //* Configure DNS
      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');
      } 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();
         if($conf['mydns']['init_script'] != '')   system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
      }
		
   }
   
   //** Configure Apache
   swriteln("\nHint: If this server shall run the ispconfig interface, select 'y' in the next option.\n");
   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 Firewall