From 99cb22d717aefea1b76ebfab33cada925c1d5e31 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 02 Mar 2009 10:46:14 -0500 Subject: [PATCH] - Changed default root for websites from /var/clients to /var/www/clients. - Added deny directives to prevent direct access to the /var/www/clients and /var/www/domain.tld directories. --- server/plugins-available/apache2_plugin.inc.php | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 3a5cbda..99e044a 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -233,14 +233,15 @@ return 0; } + //* If the client of the site has been changed, we have a change of the document root if($this->action == 'update' && $data["new"]["document_root"] != $data["old"]["document_root"]) { - // Get the old client ID + //* Get the old client ID $old_client = $app->dbmaster->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["old"]["sys_groupid"])); $old_client_id = intval($old_client["client_id"]); unset($old_client); - // Remove the old symlinks + //* Remove the old symlinks $tmp_symlinks_array = explode(':',$web_config["website_symlinks"]); if(is_array($tmp_symlinks_array)) { foreach($tmp_symlinks_array as $tmp_symlink) { @@ -256,6 +257,7 @@ } } + //* Move the site data $tmp_docroot = explode('/',$data["new"]["document_root"]); unset($tmp_docroot[count($tmp_docroot)-1]); $new_dir = implode('/',$tmp_docroot); @@ -269,6 +271,13 @@ exec('mv '.$data["old"]["document_root"].' '.$new_dir); $app->log("Moving site to new document root: ".'mv '.$data["old"]["document_root"].' '.$new_dir,LOGLEVEL_DEBUG); + //* Change the home directory and group of the website user + $command = 'usermod'; + $command .= ' --home '.escapeshellcmd($data["new"]["document_root"]); + $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); + $command .= ' '.escapeshellcmd($data["new"]["system_user"]); + exec($command); + } //print_r($data); -- Gitblit v1.9.1