Start Private Label work

latham

2011-05-24 3e41e8e84bf114c97ee49166abcfbcc42c584219

 install/update.php

@@ -66,7 +66,7 @@

//** Check for ISPConfig 2.x versions
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.');
}

//** Get distribution identifier
@@ -76,9 +76,9 @@
$conf_old = $conf;
unset($conf);

if($dist['id'] == '') die('Linux Distribution or Version not recognized.');
if($dist['id'] == '') die('Linux distribution or version not recognized.');

//** Include the distribution specific installer class library and configuration
//** Include the distribution-specific installer class library and configuration
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');
@@ -87,7 +87,6 @@
exec('hostname -f', $tmp_out);
$conf['hostname'] = $tmp_out[0];
unset($tmp_out);


//** Set the mysql login information
$conf["mysql"]["host"] = $conf_old["db_host"];
@@ -199,7 +198,7 @@
 * (if this is done at client side, only this client is updated.
 * If this is done at server side, all clients are updated.
 */
//if($conf['mysql']['master_slave_setup'] == 'y') {
//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {
   //** Update master database rights
   $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');

@@ -217,6 +216,10 @@
      //** Configure postfix
      swriteln('Configuring Postfix');
      $inst->configure_postfix('dont-create-certs');
		
      //** Configure mailman
      swriteln('Configuring Mailman');
      $inst->configure_mailman('update');
   
      //* Configure Jailkit
      swriteln('Configuring Jailkit');
@@ -253,7 +256,7 @@
      $inst->configure_getmail();
   }
   
   if($conf['services']['web']) {
   if($conf['services']['web'] && $conf['pureftpd']['installed'] == true) {
      //** Configure Pureftpd
      swriteln('Configuring Pureftpd');
      $inst->configure_pureftpd();
@@ -286,26 +289,48 @@
      swriteln('Configuring Apps vhost');
      $inst->configure_apps_vhost();
   }
	


   //* Configure DBServer
   swriteln('Configuring Database');
   $inst->configure_dbserver();

   
   //if(@is_dir('/etc/Bastille')) {
   //* Configure Firewall
   swriteln('Configuring Firewall');
   $inst->configure_firewall();
   //}
   if($conf['services']['firewall']) {
      if($conf['bastille']['installed'] == true) {
         //* Configure Bastille Firewall
         swriteln('Configuring Bastille Firewall');
         $inst->configure_firewall();
      } elseif($conf['ufw']['installed'] == true) {
         //* Configure Ubuntu Firewall
         swriteln('Configuring Ubuntu Firewall');
         $inst->configure_ufw_firewall();
      }
   }
	
   if($conf['squid']['installed'] == true) {
      swriteln('Configuring Squid');
      $inst->configure_squid();
   } else if($conf['nginx']['installed'] == true) {
      swriteln('Configuring Nginx');
      $inst->configure_nginx();
   }
}

//** Configure ISPConfig
swriteln('Updating ISPConfig');


//** Customise the port ISPConfig runs on
$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
if ($conf['services']['web'] && $inst->ispconfig_interface_installed) {
   //** Customise the port ISPConfig runs on
   $ispconfig_port_number = get_ispconfig_port_number();
   $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
	
   // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
   if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {
      $inst->make_ispconfig_ssl_cert();
   }
}

$inst->install_ispconfig();

@@ -331,6 +356,7 @@
      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($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
   }
   if($conf['services']['web']) {
      if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
@@ -341,6 +367,15 @@
      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['services']['proxy']) {
      if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_executable($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_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))               system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
   }
	
   if($conf['services']['firewall']) {
      if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script']))               system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
   }
}

echo "Update finished.\n";