From e14c6ea84f18143bbd9eb17838b28fb884e78bd3 Mon Sep 17 00:00:00 2001
From: Daniel <info@danielripoll.es>
Date: Sun, 17 Apr 2016 17:32:28 -0400
Subject: [PATCH] Feat: enable xfs-quotas. --- Daniel Ripoll I was a DevOps before it was cool. http://danielripoll.es +34 6688 27490
---
server/plugins-available/nginx_plugin.inc.php | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index c2b2abf..92c6efb 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -715,15 +715,33 @@
} // end copy error docs
// Set the quota for the user, but only for vhosts, not vhostsubdomains or vhostalias
- if($username != '' && $app->system->is_user($username) && $data['new']['type'] == 'vhost') {
+ if($username != '' && $app->system->is_user($username) && $data['new']['type'] == 'vhost') {
if($data['new']['hd_quota'] > 0) {
$blocks_soft = $data['new']['hd_quota'] * 1024;
$blocks_hard = $blocks_soft + 1024;
+ $mb_hard = $mb_soft + 1;
} else {
- $blocks_soft = $blocks_hard = 0;
+ $mb_soft = $mb_hard = $blocks_soft = $blocks_hard = 0;
}
- exec("setquota -u $username $blocks_soft $blocks_hard 0 0 -a &> /dev/null");
- exec('setquota -T -u '.$username.' 604800 604800 -a &> /dev/null');
+
+ // get the primitive folder for document_root and the filesystem, will need it later.
+ $df_output=exec("df -T $document_root|awk 'END{print \$2,\$NF}'");
+ $file_system = explode(" ", $df_output)[0];
+ $primitive_root = explode(" ", $df_output)[1];
+
+ if ( $file_system , array('ext2','ext3','ext4') ) {
+ exec('setquota -u '. $username . ' ' . $blocks_soft . ' ' . $blocks_hard . ' 0 0 -a &> /dev/null');
+ exec('setquota -T -u '.$username.' 604800 604800 -a &> /dev/null');
+ } elseif ($file_system == 'xfs') {
+
+ exec("xfs_quota -x -c 'limit -g bsoft=$mb_soft" . 'm'. " bhard=$mb_hard" . 'm'. " $username' $primitive_root");
+
+ // xfs only supports timers globally, not per user.
+ exec("xfs_quota -x -c 'timer -bir -i 604800'");
+
+ unset($project_uid, $username_position, $xfs_projects);
+ unset($primitive_root, $df_output, $mb_hard, $mb_soft);
+ }
}
if($this->action == 'insert' || $data["new"]["system_user"] != $data["old"]["system_user"]) {
--
Gitblit v1.9.1