From c82dc7f2db065520f80c3c726f39e14ec5bdcbe9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 02 Sep 2009 13:16:06 -0400
Subject: [PATCH] Restart apache instead of reloading it when system is chrooted as a reload fails when mod_chroot is used.
---
server/plugins-available/shelluser_jailkit_plugin.inc.php | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 3300b52..60524ba 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -89,10 +89,12 @@
$this->_setup_jailkit_chroot();
+ $this->_add_jailkit_user();
+
$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
exec($command);
- $this->_add_jailkit_user();
+ $this->_update_website_security_level();
}
$app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -126,6 +128,8 @@
$this->_setup_jailkit_chroot();
$this->_add_jailkit_user();
+
+ $this->_update_website_security_level();
}
$app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -161,6 +165,7 @@
exec($command);
$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
}
+
}
$app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
@@ -280,13 +285,18 @@
//* If the security level is set to high
if($web_config['security_level'] == 20) {
- exec("chmod 755 ".escapeshellcmd($web["document_root"]."/"));
- exec("chown root:root ".escapeshellcmd($web["document_root"]."/"));
+ $this->_exec("chmod 755 ".escapeshellcmd($web["document_root"]));
+ $this->_exec("chown root:root ".escapeshellcmd($web["document_root"]));
}
}
-
+ //* Wrapper for exec function for easier debugging
+ private function _exec($command) {
+ global $app;
+ $app->log("exec: ".$command,LOGLEVEL_DEBUG);
+ exec($command);
+ }
} // end class
--
Gitblit v1.9.1