From c9f8751c88110eb0249361057fe873fd27f8534b Mon Sep 17 00:00:00 2001
From: moglia <moglia@ispconfig3>
Date: Sun, 06 Sep 2009 23:30:06 -0400
Subject: [PATCH] Initial Commit of Remote Client Brazilian Portuguese Translation Files
---
server/plugins-available/apache2_plugin.inc.php | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 4014f2a..d782b57 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -236,8 +236,9 @@
$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
//* Check if this is a chrooted setup
- if($web_config['website_basedir'] != '' && @is_file($web_config['/var/www'].'/etc/passwd')) {
+ if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
$apache_chrooted = true;
+ $app->log("Info: Apache is chrooted.",LOGLEVEL_DEBUG);
} else {
$apache_chrooted = false;
}
@@ -299,7 +300,7 @@
$command .= ' '.escapeshellcmd($data["new"]["system_user"]);
exec($command);
- if($apache_chrooted) exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
+ if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
}
@@ -445,14 +446,14 @@
$groupname = escapeshellcmd($data["new"]["system_group"]);
if($data["new"]["system_group"] != '' && !$app->system->is_group($data["new"]["system_group"])) {
exec("groupadd $groupname");
- if($apache_chrooted) exec("chroot ".escapeshellcmd($web_config['website_basedir'])." groupadd $groupname");
+ if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." groupadd $groupname");
$app->log("Adding the group: $groupname",LOGLEVEL_DEBUG);
}
$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 -G sshusers $username -s /bin/false");
- if($apache_chrooted) exec("chroot ".escapeshellcmd($web_config['website_basedir'])." "."useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname -G sshusers $username -s /bin/false");
+ if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." "."useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname -G sshusers $username -s /bin/false");
$app->log("Adding the user: $username",LOGLEVEL_DEBUG);
}
@@ -498,7 +499,7 @@
//* if we have a chrooted apache enviroment
if($apache_chrooted) {
- exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
+ $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
//* add the apache user to the client group in the chroot enviroment
$tmp_groupfile = $app->system->server_conf["group_datei"];
@@ -814,9 +815,12 @@
}
-
- // request a httpd reload when all records have been processed
- $app->services->restartServiceDelayed('httpd','reload');
+ if($apache_chrooted) {
+ $app->services->restartServiceDelayed('httpd','restart');
+ } else {
+ // request a httpd reload when all records have been processed
+ $app->services->restartServiceDelayed('httpd','reload');
+ }
//* Unset action to clean it for next processed vhost.
$this->action = '';
@@ -916,7 +920,7 @@
$command = 'userdel';
$command .= ' '.$data["old"]["system_user"];
exec($command);
- if($apache_chrooted) exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
+ if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
}
}
--
Gitblit v1.9.1