From 6eaaa70ea8ee9cd1044dbd101d6573d2e134d0f2 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Mon, 01 Dec 2008 05:19:20 -0500
Subject: [PATCH] added auto-revision from svn to version
---
server/plugins-available/apache2_plugin.inc.php | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7b46615..632fda5 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -107,7 +107,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";
@@ -191,6 +191,7 @@
$tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$parent_domain_id." AND active = 'y'");
$data["new"] = $tmp;
$data["old"] = $tmp;
+ $this->action = 'update';
}
@@ -211,10 +212,11 @@
// 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"]) {
@@ -286,10 +288,12 @@
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/";
+ 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");
exec("chmod +r ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
@@ -336,6 +340,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";
@@ -367,10 +372,14 @@
// 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 = '';
+ if($data["new"]["is_subdomainwww"]){
+ $server_alias .= 'www.'.$data["new"]["domain"].' ';
+ } else {
+ $server_alias = '';
+ }
if(is_array($aliases)) {
foreach($aliases as $alias) {
- $server_alias .= $alias["domain"].' ';
+ $server_alias .= $alias["domain"].' ';
$app->log("Add server alias: $alias[domain]",LOGLEVEL_DEBUG);
// Rewriting
if($alias["redirect_type"] != '') {
@@ -432,6 +441,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