Allow a server to join existing installations in expert mode.

tbrehm

2008-05-29 ee0e1cc0c6fffc4743a3792bae1e76680916d862

 server/plugins-available/apache2_plugin.inc.php

@@ -219,12 +219,15 @@
      // Remove the symlink for the site, if site is renamed
      if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
         if(is_dir('/var/log/ispconfig/httpd/'.$data["old"]["domain"])) exec('rm -rf /var/log/ispconfig/httpd/'.$data["old"]["domain"]);
         if(is_link($data["old"]["document_root"]."/log")) exec("rm -f ".$data["old"]["document_root"]."/log");
         if(is_link($data["old"]["document_root"]."/log")) unlink($data["old"]["document_root"]."/log");
      }
      
      // Create the symlink for the logfiles
      if(!is_dir('/var/log/ispconfig/httpd/'.$data["new"]["domain"])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data["new"]["domain"]);
      if(!is_link($data["new"]["document_root"]."/log")) exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
      if(!is_link($data["new"]["document_root"]."/log")) {
         exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
         $app->log("Creating Symlink: ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log",LOGLEVEL_DEBUG);
      }
      
      
      // Get the client ID
@@ -444,6 +447,11 @@
      }
      // end removing symlinks
      
      // Delete the log file directory
      $vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);
      if($data["old"]["domain"] != '' && !stristr($vhost_logfile_dir,'..')) exec("rm -rf $vhost_logfile_dir");
      $app->log("Removing website logfile directory: $vhost_logfile_dir",LOGLEVEL_DEBUG);
		
   }
   
   //* This function is called when a IP on the server is inserted, updated or deleted