|
 |
c21e11 |
From 6400cf65afed09c63d96cc62b1e7eee964bdb6cb Mon Sep 17 00:00:00 2001
|
|
|
c21e11 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
c21e11 |
Date: Tue, 23 Aug 2011 13:45:15 +0200
|
|
|
c21e11 |
Subject: [PATCH] warnquota configuration tunes
|
|
|
c21e11 |
MIME-Version: 1.0
|
|
|
c21e11 |
Content-Type: text/plain; charset=UTF-8
|
|
|
c21e11 |
Content-Transfer-Encoding: 8bit
|
|
|
c21e11 |
|
|
|
c21e11 |
Rest of changes (378a64006bb1e818e84a1c77808563b802b028fa) not
|
|
|
c21e11 |
accepted by upstream (we had root@... addresses and more enterprise
|
|
|
c21e11 |
wordings usually there). Later improved by the upstream in
|
|
|
c21e11 |
0efb2331f1c39c9665fb6e92e83c7d080b877de1.
|
|
|
c21e11 |
|
|
|
c21e11 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
c21e11 |
---
|
|
|
c21e11 |
warnquota.c | 2 +-
|
|
|
c21e11 |
warnquota.conf | 16 ++++++++--------
|
|
|
c21e11 |
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
c21e11 |
|
|
|
c21e11 |
diff --git a/warnquota.c b/warnquota.c
|
|
|
c21e11 |
index 2882fee..48d79c0 100644
|
|
|
c21e11 |
--- a/warnquota.c
|
|
|
c21e11 |
+++ b/warnquota.c
|
|
|
c21e11 |
@@ -883,7 +883,7 @@ cc_parse_err:
|
|
|
c21e11 |
}
|
|
|
c21e11 |
#ifdef USE_LDAP_MAIL_LOOKUP
|
|
|
c21e11 |
else if (!strcmp(var, "LDAP_MAIL")) {
|
|
|
c21e11 |
- if(strcasecmp(value, "true") == 0)
|
|
|
c21e11 |
+ if(strncasecmp(value, "true", 4) == 0)
|
|
|
c21e11 |
config->use_ldap_mail = 1;
|
|
|
c21e11 |
else
|
|
|
c21e11 |
config->use_ldap_mail = 0;
|
|
|
c21e11 |
diff --git a/warnquota.conf b/warnquota.conf
|
|
|
c21e11 |
index 5bbd0ab..366c3e0 100644
|
|
|
c21e11 |
--- a/warnquota.conf
|
|
|
c21e11 |
+++ b/warnquota.conf
|
|
|
c21e11 |
@@ -19,20 +19,20 @@ FAIL = "configure /etc/warnquota.conf before running warnquota"
|
|
|
c21e11 |
#
|
|
|
c21e11 |
# command used for sending mails
|
|
|
c21e11 |
#
|
|
|
c21e11 |
-MAIL_CMD = "/usr/lib/sendmail -t"
|
|
|
c21e11 |
+MAIL_CMD = "/usr/sbin/sendmail -t"
|
|
|
c21e11 |
|
|
|
c21e11 |
#
|
|
|
c21e11 |
# Standard mail fields
|
|
|
c21e11 |
-FROM = "root@localhost"
|
|
|
c21e11 |
-SUBJECT = "Your account quota has exceeded!"
|
|
|
c21e11 |
+FROM = "root@example.com"
|
|
|
c21e11 |
+SUBJECT = "You are exceeding your allocated disk space limits"
|
|
|
c21e11 |
# Note that if LDAP is configured, the name in CC_TO gets looked up in LDAP
|
|
|
c21e11 |
# to obtain email address similarly to email recipient address.
|
|
|
c21e11 |
-CC_TO = "root@localhost"
|
|
|
c21e11 |
+CC_TO = "root@example.com"
|
|
|
c21e11 |
# If you set this variable CC will be used only when user has less than
|
|
|
c21e11 |
# specified grace time left (examples of possible times: 5 seconds, 1 minute,
|
|
|
c21e11 |
# 12 hours, 5 days)
|
|
|
c21e11 |
# CC_BEFORE = 2 days
|
|
|
c21e11 |
-SUPPORT = "root@localhost"
|
|
|
c21e11 |
+SUPPORT = "root@example.com"
|
|
|
c21e11 |
PHONE = "123 456 789"
|
|
|
c21e11 |
# Text in the beginning of the mail (if not specified, default text is used)
|
|
|
c21e11 |
# This way text can be split to more lines
|
|
|
c21e11 |
@@ -40,11 +40,11 @@ PHONE = "123 456 789"
|
|
|
c21e11 |
# The expressions %i, %h, %d, and %% are substituted for user/group name,
|
|
|
c21e11 |
# host name, domain name, and '%' respectively. For backward compatibility
|
|
|
c21e11 |
# %s behaves as %i but is deprecated.
|
|
|
c21e11 |
-MESSAGE = Hello user %i, I've noticed you use too much space\
|
|
|
c21e11 |
- on my disk in %h.%d.|Delete your files on the following filesystems:|
|
|
|
c21e11 |
+MESSAGE = Your disk usage has exceeded the agreed limits\
|
|
|
c21e11 |
+ on this server|Please delete any unnecessary files on following filesystems:|
|
|
|
c21e11 |
# Text in the end of the mail (if not specified, default text using SUPPORT and PHONE
|
|
|
c21e11 |
# is created)
|
|
|
c21e11 |
-SIGNATURE = See you!| Your admin of %h|
|
|
|
c21e11 |
+SIGNATURE = root@example.com
|
|
|
c21e11 |
# Following text is used for mails about group exceeding quotas
|
|
|
c21e11 |
GROUP_MESSAGE = Hello,|\
|
|
|
c21e11 |
your group %i is using too much disk space at %h.|\
|
|
|
c21e11 |
--
|
|
|
c21e11 |
2.25.4
|
|
|
c21e11 |
|