Commit eded9dcc authored by tbrehm's avatar tbrehm
Browse files

- cgi, ssi and sueexec could not be disabled in vhosts

- logfile directory was not deleted when a site was deleted.
parent a791b489
......@@ -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>
......
......@@ -447,6 +447,11 @@ class apache2_plugin {
}
// 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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment