|
|
aa88b6e |
--- quota-tools/warnquota.conf.orig 2005-07-19 11:51:07.000000000 -0400
|
|
|
aa88b6e |
+++ quota-tools/warnquota.conf 2007-02-15 14:58:38.000000000 -0500
|
|
|
aa88b6e |
@@ -4,16 +4,16 @@
|
|
cvsdist |
7cac735 |
# and even blank lines
|
|
cvsdist |
7cac735 |
|
|
cvsdist |
7cac735 |
# values can be quoted:
|
|
cvsdist |
7cac735 |
-MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
|
|
cvsdist |
7cac735 |
-FROM = "bas@localhost"
|
|
cvsdist |
7cac735 |
+MAIL_CMD = "/usr/sbin/sendmail -t"
|
|
cvsdist |
902fba1 |
+FROM =
|
|
cvsdist |
7cac735 |
# but they don't have to be:
|
|
cvsdist |
7cac735 |
-SUBJECT = Hey, user, clean up your account!
|
|
cvsdist |
7cac735 |
-CC_TO = "sysadm@localhost"
|
|
|
768a01e |
+SUBJECT = NOTE: You are exceeding your allocated disk space limits
|
|
cvsdist |
7cac735 |
+CC_TO = "root@localhost"
|
|
|
5035648 |
# If you set this variable CC will be used only when user has less than
|
|
|
5035648 |
# specified grace time left (examples of possible times: 5 seconds, 1 minute,
|
|
|
5035648 |
# 12 hours, 5 days)
|
|
|
5035648 |
# CC_BEFORE = 2 days
|
|
|
5035648 |
-SUPPORT = "support@myhost.com"
|
|
cvsdist |
7cac735 |
+SUPPORT = "root@myhost.com"
|
|
cvsdist |
7cac735 |
PHONE = "(123) 456-1111 or (222) 333-4444"
|
|
cvsdist |
7cac735 |
# Text in the beginning of the mail (if not specified, default text is used)
|
|
cvsdist |
7cac735 |
# This way text can be split to more lines
|
|
|
aa88b6e |
@@ -21,11 +21,11 @@ PHONE = "(123) 456-1111 or (222) 333-4
|
|
|
aa88b6e |
# The expressions %i, %h, %d, and %% are substituted for user/group name,
|
|
|
aa88b6e |
# host name, domain name, and '%' respectively. For backward compatibility
|
|
|
aa88b6e |
# %s behaves as %i but is deprecated.
|
|
|
aa88b6e |
-MESSAGE = Hello user %i, I've noticed you use too much space\
|
|
|
aa88b6e |
- on my disk in %h.%d.|Delete your files on the following filesystems:|
|
|
|
768a01e |
+MESSAGE = Your disk usage has exceeded the agreed limits\
|
|
cvsdist |
7cac735 |
+ on this server|Please delete any unnecessary files on following filesystems:|
|
|
cvsdist |
7cac735 |
# Text in the end of the mail (if not specified, default text using SUPPORT and PHONE
|
|
cvsdist |
7cac735 |
# is created)
|
|
|
aa88b6e |
-SIGNATURE = See you!| Your admin of %h|
|
|
cvsdist |
7cac735 |
+SIGNATURE = root@localhost
|
|
cvsdist |
902fba1 |
# Following text is used for mails about group exceeding quotas
|
|
|
aa88b6e |
GROUP_MESSAGE = Hello, a group '%i' you're member of use too much space at %h.|\
|
|
|
aa88b6e |
I chose you to do the cleanup.|Delete group files on the following filesystems:|
|
|
|
5b31e8e |
@@ -52,10 +52,10 @@ GROUP_SIGNATURE = See you!| Your admin
|
|
|
5b31e8e |
# if the attribute isn't found
|
|
|
5b31e8e |
# if binddn and bindpw are blank or left out, an anonymous bind is used
|
|
|
5b31e8e |
#
|
|
|
5b31e8e |
-# LDAP_MAIL = false # or false if you don't want to use it
|
|
|
5b31e8e |
-# If you have at least LDAP 2.3 installed, you can use LDAP_URI
|
|
|
5b31e8e |
+# LDAP_MAIL = false # or true if you want to use it
|
|
|
5b31e8e |
+# If you have at least LDAP 2.3 installed, you should use LDAP_URI
|
|
|
5b31e8e |
# LDAP_URI = ldaps://my.server:389
|
|
|
5b31e8e |
-# Otherwise you can specify LDAP_HOST and LDAP_PORT
|
|
|
5b31e8e |
+# Otherwise you should specify LDAP_HOST and LDAP_PORT
|
|
|
5b31e8e |
# LDAP_HOST = ldap
|
|
|
5b31e8e |
# LDAP_PORT = 389
|
|
|
5b31e8e |
# LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg
|
|
|
5b31e8e |
diff -urNp quota-tools-orig/warnquota.c quota-tools/warnquota.c
|
|
|
5b31e8e |
--- quota-tools-orig/warnquota.c 2008-10-13 19:29:18.000000000 +0200
|
|
|
5b31e8e |
+++ quota-tools/warnquota.c 2009-03-13 14:26:33.000000000 +0100
|
|
|
5b31e8e |
@@ -806,7 +806,7 @@ static int readconfigfile(const char *fi
|
|
|
5b31e8e |
verify_format(config->group_signature, "GROUP_SIGNATURE");
|
|
|
5b31e8e |
}
|
|
|
5b31e8e |
else if (!strcmp(var, "LDAP_MAIL")) {
|
|
|
5b31e8e |
- if(strcasecmp(value, "true") == 0)
|
|
|
5b31e8e |
+ if(strncasecmp(value, "true", 4) == 0)
|
|
|
5b31e8e |
config->use_ldap_mail = 1;
|
|
|
5b31e8e |
else
|
|
|
5b31e8e |
config->use_ldap_mail = 0;
|