|
 |
dba0f0 |
From d2f7a6be1526a6f46cbf37aa27587a51e4d5990f Mon Sep 17 00:00:00 2001
|
|
|
dba0f0 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
dba0f0 |
Date: Tue, 23 Aug 2011 13:45:15 +0200
|
|
|
dba0f0 |
Subject: [PATCH] warnquota configuration tunes
|
|
|
dba0f0 |
|
|
|
dba0f0 |
Rest of changes (378a64006bb1e818e84a1c77808563b802b028fa) not
|
|
|
dba0f0 |
accepted by upstream (we had root@... addresses and more enterprise
|
|
|
dba0f0 |
wordings usually there).
|
|
|
dba0f0 |
---
|
|
|
dba0f0 |
warnquota.c | 2 +-
|
|
|
dba0f0 |
warnquota.conf | 17 ++++++++---------
|
|
|
dba0f0 |
2 files changed, 9 insertions(+), 10 deletions(-)
|
|
|
dba0f0 |
|
|
|
dba0f0 |
diff --git a/warnquota.c b/warnquota.c
|
|
|
dba0f0 |
index 08827f2..c7ca6f2 100644
|
|
|
dba0f0 |
--- a/warnquota.c
|
|
|
dba0f0 |
+++ b/warnquota.c
|
|
|
dba0f0 |
@@ -806,7 +806,7 @@ static int readconfigfile(const char *filename, struct configparams *config)
|
|
|
dba0f0 |
verify_format(config->group_signature, "GROUP_SIGNATURE");
|
|
|
dba0f0 |
}
|
|
|
dba0f0 |
else if (!strcmp(var, "LDAP_MAIL")) {
|
|
|
dba0f0 |
- if(strcasecmp(value, "true") == 0)
|
|
|
dba0f0 |
+ if(strncasecmp(value, "true", 4) == 0)
|
|
|
dba0f0 |
config->use_ldap_mail = 1;
|
|
|
dba0f0 |
else
|
|
|
dba0f0 |
config->use_ldap_mail = 0;
|
|
|
dba0f0 |
diff --git a/warnquota.conf b/warnquota.conf
|
|
|
dba0f0 |
index 2a72b78..77f6a75 100644
|
|
|
dba0f0 |
--- a/warnquota.conf
|
|
|
dba0f0 |
+++ b/warnquota.conf
|
|
|
dba0f0 |
@@ -4,17 +4,16 @@
|
|
|
dba0f0 |
# and even blank lines
|
|
|
dba0f0 |
|
|
|
dba0f0 |
# values can be quoted:
|
|
|
dba0f0 |
-#MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
|
|
|
dba0f0 |
-MAIL_CMD = "/bin/echo"
|
|
|
dba0f0 |
-FROM = "bas@example.com"
|
|
|
dba0f0 |
+MAIL_CMD = "/usr/sbin/sendmail -t"
|
|
|
dba0f0 |
+FROM = "root@example.com"
|
|
|
dba0f0 |
# but they don't have to be:
|
|
|
dba0f0 |
-SUBJECT = Hey, user, clean up your account!
|
|
|
dba0f0 |
-CC_TO = "sysadm@example.com"
|
|
|
dba0f0 |
+SUBJECT = NOTE: You are exceeding your allocated disk space limits
|
|
|
dba0f0 |
+CC_TO = "root@example.com"
|
|
|
dba0f0 |
# If you set this variable CC will be used only when user has less than
|
|
|
dba0f0 |
# specified grace time left (examples of possible times: 5 seconds, 1 minute,
|
|
|
dba0f0 |
# 12 hours, 5 days)
|
|
|
dba0f0 |
# CC_BEFORE = 2 days
|
|
|
dba0f0 |
-SUPPORT = "support@example.com"
|
|
|
dba0f0 |
+SUPPORT = "root@example.com"
|
|
|
dba0f0 |
PHONE = "(123) 456-1111 or (222) 333-4444"
|
|
|
dba0f0 |
# Text in the beginning of the mail (if not specified, default text is used)
|
|
|
dba0f0 |
# This way text can be split to more lines
|
|
|
dba0f0 |
@@ -22,11 +21,11 @@ PHONE = "(123) 456-1111 or (222) 333-4444"
|
|
|
dba0f0 |
# The expressions %i, %h, %d, and %% are substituted for user/group name,
|
|
|
dba0f0 |
# host name, domain name, and '%' respectively. For backward compatibility
|
|
|
dba0f0 |
# %s behaves as %i but is deprecated.
|
|
|
dba0f0 |
-MESSAGE = Hello user %i, I've noticed you use too much space\
|
|
|
dba0f0 |
- on my disk in %h.%d.|Delete your files on the following filesystems:|
|
|
|
dba0f0 |
+MESSAGE = Your disk usage has exceeded the agreed limits\
|
|
|
dba0f0 |
+ on this server|Please delete any unnecessary files on following filesystems:|
|
|
|
dba0f0 |
# Text in the end of the mail (if not specified, default text using SUPPORT and PHONE
|
|
|
dba0f0 |
# is created)
|
|
|
dba0f0 |
-SIGNATURE = See you!| Your admin of %h|
|
|
|
dba0f0 |
+SIGNATURE = root@example.com
|
|
|
dba0f0 |
# Following text is used for mails about group exceeding quotas
|
|
|
dba0f0 |
GROUP_MESSAGE = Hello, a group '%i' you're member of use too much space at %h.|\
|
|
|
dba0f0 |
I chose you to do the cleanup.|Delete group files on the following filesystems:|
|
|
|
dba0f0 |
--
|
|
|
dba0f0 |
1.7.11.4
|
|
|
dba0f0 |
|