From b36d50e4a4087c4740e81680190b7dcab92665a6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 05 Aug 2009 06:14:11 -0400
Subject: [PATCH] Fixed bug in firewall.
---
server/plugins-available/apache2_plugin.inc.php | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 9e1c948..1a962ec 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -261,7 +261,7 @@
// 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)) {
+ if(is_link($tmp_symlink)) {
exec("rm -f ".escapeshellcmd($tmp_symlink));
$app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);
}
@@ -475,6 +475,14 @@
exec("chmod 711 ".escapeshellcmd($data["new"]["document_root"]."/"));
exec("chmod 711 ".escapeshellcmd($data["new"]["document_root"])."/*");
exec("chmod 710 ".escapeshellcmd($data["new"]["document_root"]."/web"));
+
+ // make temp direcory writable for the apache user and the website user
+ exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
+
+ $command = 'usermod';
+ $command .= ' --groups sshusers';
+ $command .= ' '.escapeshellcmd($data["new"]["system_user"]);
+ exec($command);
//* add the apache user to the client group
$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
@@ -748,7 +756,7 @@
}
//* Create .htaccess and .htpasswd file for website statistics
- if(!is_file($data["new"]["document_root"].'/web/stats/.htaccess')) {
+ if(!is_file($data["new"]["document_root"].'/web/stats/.htaccess') or $data["old"]["document_root"] != $data["new"]["document_root"]) {
if(!is_dir($data["new"]["document_root"].'/web/stats')) mkdir($data["new"]["document_root"].'/web/stats');
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data["new"]["document_root"]."/.htpasswd_stats\n<limit GET PUT POST>\nrequire valid-user\n</limit>";
file_put_contents($data["new"]["document_root"].'/web/stats/.htaccess',$ht_file);
--
Gitblit v1.9.1