From 7227e86264ce29150c51a289fea143af53108d4e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 18 Dec 2008 07:34:05 -0500
Subject: [PATCH] Replace website symlink in /var/www when target directory has been changed.
---
server/plugins-available/apache2_plugin.inc.php | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 12 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index a5f5f42..da6d877 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -36,6 +36,19 @@
// private variables
var $action = '';
+ //* This function is called during ispconfig installation to determine
+ // if a symlink shall be created for this plugin.
+ function onInstall() {
+ global $conf;
+
+ if($conf['services']['web'] == true) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
/*
This function is called when the plugin is loaded
@@ -107,7 +120,7 @@
O = ".$data['new']['ssl_organisation']."
OU = ".$data['new']['ssl_organisation_unit']."
CN = $domain
- emailAddress = webmatser@".$data['new']['domain']."
+ emailAddress = webmaster@".$data['new']['domain']."
[ req_attributes ]
challengePassword = A challenge password";
@@ -186,11 +199,24 @@
if($this->action != 'insert') $this->action = 'update';
if($data["new"]["type"] != "vhost" && $data["new"]["parent_domain_id"] > 0) {
+
+ $old_parent_domain_id = intval($data["old"]["parent_domain_id"]);
+ $new_parent_domain_id = intval($data["new"]["parent_domain_id"]);
+
+ // If the parent_domain_id has been chenged, we will have to update the old site as well.
+ if($data["new"]["parent_domain_id"] != $data["old"]["parent_domain_id"]) {
+ $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$old_parent_domain_id." AND active = 'y'");
+ $data["new"] = $tmp;
+ $data["old"] = $tmp;
+ $this->action = 'update';
+ $this->update($event_name,$data);
+ }
+
// This is not a vhost, so we need to update the parent record instead.
- $parent_domain_id = intval($data["new"]["parent_domain_id"]);
- $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$parent_domain_id." AND active = 'y'");
+ $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$new_parent_domain_id." AND active = 'y'");
$data["new"] = $tmp;
$data["old"] = $tmp;
+ $this->action = 'update';
}
@@ -211,12 +237,27 @@
// Check if the directories are there and create them if nescessary.
if(!is_dir($data["new"]["document_root"]."/web")) exec("mkdir -p ".$data["new"]["document_root"]."/web");
- if(!is_dir($data["new"]["document_root"]."/web/error")) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
+ if(!is_dir($data["new"]["document_root"]."/web/error") and $data["new"]["errordocs"]) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
//if(!is_dir($data["new"]["document_root"]."/log")) exec("mkdir -p ".$data["new"]["document_root"]."/log");
if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
+ if(!is_dir($data["new"]["document_root"]."/tmp")) exec("mkdir -p ".$data["new"]["document_root"]."/tmp");
// 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")) 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");
+ $app->log("Creating Symlink: ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log",LOGLEVEL_DEBUG);
+ }
+ /*
+ // Create the symlink for the logfiles
+ // This does not work as vlogger can not log trogh symlinks.
if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
if(is_dir($data["old"]["document_root"]."/log")) exec('rm -rf '.$data["old"]["document_root"]."/log");
if(is_link('/var/log/ispconfig/httpd/'.$data["old"]["domain"])) unlink('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);
@@ -228,6 +269,7 @@
exec("ln -s ".$data["new"]["document_root"]."/log /var/log/ispconfig/httpd/".$data["new"]["domain"]);
$app->log("Creating Symlink: ln -s ".$data["new"]["document_root"]."/log /var/log/ispconfig/httpd/".$data["new"]["domain"],LOGLEVEL_DEBUG);
}
+ */
// Get the client ID
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["new"]["sys_groupid"]));
@@ -260,6 +302,10 @@
$tmp_symlink = str_replace("[website_domain]",$data["new"]["domain"],$tmp_symlink);
// Remove trailing slash
if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
+ //* Remove symlink if target folder has been changed.
+ if($data["old"]["document_root"] != '' && $data["old"]["document_root"] != $data["new"]["document_root"] && is_link($tmp_symlink)) {
+ unlink($tmp_symlink);
+ }
// create the symlinks, if not exist
if(!is_link($tmp_symlink)) {
exec("ln -s ".escapeshellcmd($data["new"]["document_root"])."/ ".escapeshellcmd($tmp_symlink));
@@ -269,14 +315,36 @@
}
- if($this->action == 'insert') {
+ if($this->action == 'insert' && $data["new"]["type"] == 'vhost') {
// Copy the error pages
- $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
- exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
- exec("chmod -R +r ".$error_page_path);
-
+ if($data["new"]["errordocs"]){
+ $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
+ if (file_exists("/usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2))){
+ exec("cp /usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
+ }
+ else {
+ if (file_exists("/usr/local/ispconfig/server/conf-custom/error/fileNotFound.html")){
+ exec("cp /usr/local/ispconfig/server/conf-custom/error/*.html ".$error_page_path);
+ }
+ else {
+ exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
+ }
+ }
+ exec("chmod -R +r ".$error_page_path);
+ }
+
// copy the standard index page
- exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
+ if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2))){
+ exec("cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
+ }
+ else {
+ if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html")){
+ exec("cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
+ }
+ else {
+ exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
+ }
+ }
exec("chmod +r ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
}
@@ -312,6 +380,9 @@
// Chown and chmod the directories
exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
+ // make temp direcory writable for the apache user and the website user
+ exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
+
// Create the vhost config file
$app->load('tpl');
@@ -321,6 +392,7 @@
$vhost_data = $data["new"];
$vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";
+ $vhost_data["web_document_root_www"] = "/var/www/".$data["new"]["domain"]."/web";
// Check if a SSL cert exists
$ssl_dir = $data["new"]["document_root"]."/ssl";
@@ -352,10 +424,27 @@
// get alias domains (co-domains and subdomains)
$aliases = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$data["new"]["domain_id"]." AND active = 'y'");
- $server_alias = '';
+ switch($data["new"]["subdomain"]) {
+ case 'www':
+ $server_alias .= 'www.'.$data["new"]["domain"].' ';
+ break;
+ case '*':
+ $server_alias .= '*.'.$data["new"]["domain"].' ';
+ break;
+ }
if(is_array($aliases)) {
foreach($aliases as $alias) {
- $server_alias .= $alias["domain"].' ';
+ switch($alias["subdomain"]) {
+ case 'www':
+ $server_alias .= 'www.'.$alias["domain"].' '.$alias["domain"].' ';
+ break;
+ case '*':
+ $server_alias .= '*.'.$alias["domain"].' '.$alias["domain"].' ';
+ break;
+ default:
+ $server_alias .= $alias["domain"].' ';
+ break;
+ }
$app->log("Add server alias: $alias[domain]",LOGLEVEL_DEBUG);
// Rewriting
if($alias["redirect_type"] != '') {
@@ -417,6 +506,7 @@
$tpl->setVar('fastcgi_alias',$fastcgi_config["fastcgi_alias"]);
$tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
+ $tpl->setVar('fastcgi_starter_script',$fastcgi_config["fastcgi_starter_script"]);
}
--
Gitblit v1.9.1