From eded9dcce84eb3f8c98e23256fde8570030ec9c7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 May 2008 11:56:36 -0400
Subject: [PATCH] - cgi, ssi and sueexec could not be disabled in vhosts - logfile directory was not deleted when a site was deleted.
---
server/conf/vhost.conf.master | 6 +++---
server/plugins-available/apache2_plugin.inc.php | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 78b57d8..0d6f14e 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -16,18 +16,18 @@
<tmpl_if name='alias'>
ServerAlias <tmpl_var name='alias'>
</tmpl_if>
-<tmpl_if name='cgi'>
+<tmpl_if name='cgi' op='==' value='y'>
# cgi enabled
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
AddHandler cgi-script .cgi
AddHandler cgi-script .pl
</tmpl_if>
-<tmpl_if name='ssi'>
+<tmpl_if name='ssi' op='==' value='y'>
# ssi enabled
AddType text/html .shtml
AddOutputFilter INCLUDES .shtml
</tmpl_if>
-<tmpl_if name='suexec'>
+<tmpl_if name='suexec' op='==' value='y'>
# suexec enabled
SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
</tmpl_if>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5fb3648..c0b04a4 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -447,6 +447,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