From ee0e1cc0c6fffc4743a3792bae1e76680916d862 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 29 May 2008 04:56:07 -0400
Subject: [PATCH] Allow a server to join existing installations in expert mode.
---
server/plugins-available/apache2_plugin.inc.php | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index bd21d04..c0b04a4 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/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["new"]["document_root"]."/log")) exec("rm -f ".$data["new"]["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
@@ -238,7 +241,7 @@
if(is_array($tmp_symlinks_array)) {
foreach($tmp_symlinks_array as $tmp_symlink) {
$tmp_symlink = str_replace("[client_id]",$client_id,$tmp_symlink);
- $tmp_symlink = str_replace("[website_domain]",$data["new"]["domain"],$tmp_symlink);
+ $tmp_symlink = str_replace("[website_domain]",$data["old"]["domain"],$tmp_symlink);
// Remove trailing slash
if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
// create the symlinks, if not exist
@@ -389,6 +392,16 @@
$app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
}
+ // remove old symlink and vhost file, if domain name of the site has changed
+ if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
+ $vhost_symlink = escapeshellcmd($web_config["vhost_conf_enabled_dir"].'/'.$data["old"]["domain"].'.vhost');
+ unlink($vhost_symlink);
+ $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
+ $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["old"]["domain"].'.vhost');
+ unlink($vhost_file);
+ $app->log("Removing File $vhost_file",LOGLEVEL_DEBUG);
+ }
+
// request a httpd reload when all records have been processed
$app->services->restartServiceDelayed('httpd','reload');
@@ -434,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
--
Gitblit v1.9.1