From 318ace2f67a99c686611437c4cb0ce04a8ff8cee Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 14 Apr 2008 15:43:14 +0000 Subject: [PATCH] --- server/plugins-available/apache2_plugin.inc.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index bd21d0476a..2bc60895ea 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -238,7 +238,7 @@ class apache2_plugin { 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 +389,13 @@ class apache2_plugin { $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG); } + // remove old symlink, 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); + } + // request a httpd reload when all records have been processed $app->services->restartServiceDelayed('httpd','reload'); -- GitLab