From a91fdb2f9c8705d68bff3c5ec3037d7ba5490512 Mon Sep 17 00:00:00 2001
From: daniel <daniel@ispconfig3>
Date: Thu, 05 Jun 2008 16:45:15 -0400
Subject: [PATCH] Log symlinks changed
---
server/plugins-available/apache2_plugin.inc.php | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 98 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 3beb679..98fcfd0 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -216,14 +216,43 @@
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");
- // 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");
+ // 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($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"]);
+ }
- // Create the symlinks for the sites
+ // Create the symlink for the logfiles
+ if(!is_dir($data["new"]["document_root"]."/log")) exec('mkdir -p '.$data["new"]["document_root"]."/log");
+ if(!is_link('/var/log/ispconfig/httpd/'.$data["new"]["domain"])) {
+ 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"]));
$client_id = intval($client["client_id"]);
unset($client);
+
+ // Remove old symlinks, if site is renamed
+ if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
+ $tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);
+ 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["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
+ if(!is_link($tmp_symlink)) {
+ exec("rm -f ".escapeshellcmd($tmp_symlink));
+ $app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);
+ }
+ }
+ }
+ }
+
+ // Create the symlinks for the sites
$tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);
if(is_array($tmp_symlinks_array)) {
foreach($tmp_symlinks_array as $tmp_symlink) {
@@ -238,6 +267,7 @@
}
}
}
+
if($this->action == 'insert') {
// Copy the error pages
@@ -261,7 +291,7 @@
$username = escapeshellcmd($data["new"]["system_user"]);
if($data["new"]["system_user"] != '' && !$app->system->is_user($data["new"]["system_user"])) {
- exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username");
+ exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username -s /bin/false");
$app->log("Adding the user: $username",LOGLEVEL_DEBUG);
}
@@ -343,6 +373,43 @@
}
$tpl->setLoop('redirects',$rewrite_rules);
+ /**
+ * install fast-cgi starter script and add script aliasd config
+ * first we create the script directory if not already created, then copy over the starter script
+ * settings are copied over from the server ini config for now
+ * TODO: Create form for fastcgi configs per site.
+ */
+
+ if ($data["new"]["php"] == "fast-cgi")
+ {
+ $fastcgi_starter_path = str_replace("[system_user]",$data["new"]["system_user"],$web_config["fastcgi_starter_path"]);
+ if (!is_dir($fastcgi_starter_path))
+ {
+ exec("mkdir $fastcgi_starter_path");
+ exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." $fastcgi_starter_path");
+ }
+
+ $fcgi_tpl = new tpl();
+ $fcgi_tpl->newTemplate("php-fcgi-starter.master");
+
+ $fcgi_tpl->setVar('php_ini_path',$web_config["fastcgi_phpini_path"]);
+ $fcgi_tpl->setVar('document_root',$data["new"]["document_root"]);
+ $fcgi_tpl->setVar('php_fcgi_children',$web_config["fastcgi_children"]);
+ $fcgi_tpl->setVar('php_fcgi_max_requests',$web_config["fastcgi_max_requests"]);
+ $fcgi_tpl->setVar('php_fcgi_bin',$web_config["fastcgi_bin"]);
+
+ $fcgi_starter_script = escapeshellcmd($fastcgi_starter_path."/".$web_config["fastcgi_starter_script"]);
+ file_put_contents($fcgi_starter_script,$fcgi_tpl->grab());
+ unset($fcgi_tpl);
+
+ exec("chmod 755 $fcgi_starter_script");
+ exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." $fcgi_starter_script");
+
+ $tpl->setVar('fastcgi_alias',$web_config["fastcgi_alias"]);
+ $tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
+
+ }
+
$vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["new"]["domain"].'.vhost');
file_put_contents($vhost_file,$tpl->grab());
$app->log("Writing the vhost file: $vhost_file",LOGLEVEL_DEBUG);
@@ -359,6 +426,16 @@
if($data["new"]["active"] == 'n' && is_link($vhost_symlink)) {
unlink($vhost_symlink);
$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
@@ -384,6 +461,17 @@
$docroot = escapeshellcmd($data["old"]["document_root"]);
if($docroot != '' && !stristr($docroot,'..')) exec("rm -rf $docroot");
+
+ //remove the php fastgi starter script if available
+ if ($data["old"]["php"] == "fast-cgi")
+ {
+ $fastcgi_starter_path = str_replace("[system_user]",$data["old"]["system_user"],$web_config["fastcgi_starter_path"]);
+ if (is_dir($fastcgi_starter_path))
+ {
+ exec("rm -rf $fastcgi_starter_path");
+ }
+ }
+
$app->log("Removing website: $docroot",LOGLEVEL_DEBUG);
// Delete the symlinks for the sites
@@ -406,6 +494,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