From 15d78a3e167f3783377ca2c1d8f570a25d137b35 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 17 Oct 2007 14:55:24 -0400
Subject: [PATCH] added symlink creation for websites on the server.
---
server/plugins-enabled/apache2_plugin.inc.php | 100 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 93 insertions(+), 7 deletions(-)
diff --git a/server/plugins-enabled/apache2_plugin.inc.php b/server/plugins-enabled/apache2_plugin.inc.php
index 3d01fd6..520bcb7 100644
--- a/server/plugins-enabled/apache2_plugin.inc.php
+++ b/server/plugins-enabled/apache2_plugin.inc.php
@@ -49,6 +49,10 @@
$app->plugins->registerEvent('web_domain_update',$this->plugin_name,'update');
$app->plugins->registerEvent('web_domain_delete',$this->plugin_name,'delete');
+ $app->plugins->registerEvent('server_ip_insert',$this->plugin_name,'server_ip');
+ $app->plugins->registerEvent('server_ip_update',$this->plugin_name,'server_ip');
+ $app->plugins->registerEvent('server_ip_delete',$this->plugin_name,'server_ip');
+
}
function insert($event_name,$data) {
@@ -64,6 +68,16 @@
function update($event_name,$data) {
global $app, $conf;
+
+ if($data["new"]["type"] != "vhost" && $data["new"]["parent_domain_id"] > 0) {
+ // 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'");
+ $data["new"] = $tmp;
+ $data["old"] = $tmp;
+ }
+
+
// load the server configuration options
$app->uses("getconf");
$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
@@ -72,17 +86,41 @@
$app->log("document_root not set",LOGLEVEL_WARN);
return 0;
}
+ if($data["new"]["system_user"] == 'root' or $data["new"]["system_group"] == 'root') {
+ $app->log("Websites can not be owned by the root user or group.",LOGLEVEL_WARN);
+ return 0;
+ }
//print_r($data);
// 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"]."/log")) exec("mkdir -p ".$data["new"]["document_root"]."/log");
+ 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"]."/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");
- // TODO: Create the symlinks
+ // 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");
+ // Create the symlinks for the sites
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["new"]["sys_groupid"]));
+ $client_id = intval($client["client_id"]);
+ unset($client);
+ $tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);
+ 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);
+ if(!is_link($tmp_symlink)) {
+ exec("ln -s ".escapeshellcmd($data["new"]["document_root"])."/ ".escapeshellcmd($tmp_symlink));
+ $app->log("Creating Symlink: ln -s ".$data["new"]["document_root"]."/ ".$tmp_symlink,LOGLEVEL_DEBUG);
+ }
+ }
+
+ // Copy the error pages
+ $error_page_path = escapeshellcmd($data["new"]["web_document_root"])."/web/error/";
+ exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
// Create group and user, if not exist
$app->uses("system");
@@ -99,6 +137,20 @@
$app->log("Adding the user: $username",LOGLEVEL_DEBUG);
}
+ // Set the quota for the user
+ if($username != '' && $app->system->is_user($username)) {
+ if($data["new"]["hd_quota"] > 0){
+ $blocks_soft = $data["new"]["hd_quota"] * 1024;
+ $blocks_hard = $blocks_soft + 1024;
+ } else {
+ $blocks_soft = $blocks_hard = 0;
+ }
+ exec("setquota -u $username $blocks_soft $blocks_hard 0 0 -a &> /dev/null");
+ exec("setquota -T -u $username 604800 604800 -a &> /dev/null");
+ }
+
+
+
// Chown and chmod the directories
exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
@@ -109,16 +161,40 @@
$tpl->newTemplate("vhost.conf.master");
$vhost_data = $data["new"];
- $vhost_data["document_root"] = $data["new"]["document_root"]."/web";
+ $vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";
+ //$vhost_data["document_root"] = $data["new"]["document_root"]."/web";
$tpl->setVar($vhost_data);
- // get alias domains
- $aliases = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$data["new"]["domain_id"]);
+ // Rewrite rules
+ $rewrite_rules = array();
+ if($data["new"]["redirect_type"] != '') {
+ $rewrite_rules[] = array( 'rewrite_domain' => $data["new"]["domain"],
+ 'rewrite_type' => $data["new"]["redirect_type"],
+ 'rewrite_target' => $data["new"]["redirect_path"]);
+ }
+
+ // 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 = '';
- foreach($aliases as $alias) {
- $server_alias .= $alias["domain"].' ';
+ if(is_array($aliases)) {
+ foreach($aliases as $alias) {
+ $server_alias .= $alias["domain"].' ';
+ $app->log("Add server alias: $alias[domain]",LOGLEVEL_DEBUG);
+ // Rewriting
+ if($alias["redirect_type"] != '') {
+ $rewrite_rules[] = array( 'rewrite_domain' => $alias["domain"],
+ 'rewrite_type' => $alias["redirect_type"],
+ 'rewrite_target' => $alias["redirect_path"]);
+ }
+ }
}
$tpl->setVar('alias',trim($server_alias));
+ if(count($rewrite_rules) > 0) {
+ $tpl->setVar('rewrite_enabled',1);
+ } else {
+ $tpl->setVar('rewrite_enabled',0);
+ }
+ $tpl->setLoop('redirects',$rewrite_rules);
$vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["new"]["domain"].'.vhost');
file_put_contents($vhost_file,$tpl->grab());
@@ -165,6 +241,16 @@
}
+ //* This function is called when a IP on the server is inserted, updated or deleted
+ function server_ip($event_name,$data) {
+ global $app, $conf;
+
+ // Here we write the name virtualhost directives
+ // NameVirtualHost IP:80
+ // NameVirtualHost IP:443
+
+ }
+
} // end class
--
Gitblit v1.9.1