From bb1f11c943a902e95dd5927686c0268546e9d1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 28 Feb 2011 15:26:20 +0100 Subject: [PATCH] Do not use real domains in warnquota example --- ...se-real-domains-in-warnquota-example.patch | 46 +++++++++++++++++++ quota.spec | 8 +++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch diff --git a/quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch b/quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch new file mode 100644 index 0000000..5c95400 --- /dev/null +++ b/quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch @@ -0,0 +1,46 @@ +From 85cb5b094c8e6a352df4c5bdbbfd6af4c47a7ae7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 28 Feb 2011 14:16:59 +0100 +Subject: [PATCH] Do not use real domains in warnquota example + +Providing private domain names in default warnquota.conf can tend +some users to reply. Owners of that domain could get mad. +--- + warnquota.conf | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/warnquota.conf b/warnquota.conf +index 153b3f2..e70eedf 100644 +--- a/warnquota.conf ++++ b/warnquota.conf +@@ -5,15 +5,15 @@ + + # values can be quoted: + MAIL_CMD = "/usr/sbin/sendmail -t" +-FROM = ++FROM = root@example.com + # but they don't have to be: + SUBJECT = NOTE: You are exceeding your allocated disk space limits +-CC_TO = "root@localhost" ++CC_TO = "root@example.com" + # If you set this variable CC will be used only when user has less than + # specified grace time left (examples of possible times: 5 seconds, 1 minute, + # 12 hours, 5 days) + # CC_BEFORE = 2 days +-SUPPORT = "root@myhost.com" ++SUPPORT = "root@example.com" + PHONE = "(123) 456-1111 or (222) 333-4444" + # Text in the beginning of the mail (if not specified, default text is used) + # This way text can be split to more lines +@@ -25,7 +25,7 @@ MESSAGE = Your disk usage has exceeded the agreed limits\ + on this server|Please delete any unnecessary files on following filesystems:| + # Text in the end of the mail (if not specified, default text using SUPPORT and PHONE + # is created) +-SIGNATURE = root@localhost ++SIGNATURE = root@example.com + # Following text is used for mails about group exceeding quotas + GROUP_MESSAGE = Hello, a group '%i' you're member of use too much space at %h.|\ + I chose you to do the cleanup.|Delete group files on the following filesystems:| +-- +1.7.4 + diff --git a/quota.spec b/quota.spec index 4ddda60..33bac00 100644 --- a/quota.spec +++ b/quota.spec @@ -5,7 +5,7 @@ Name: quota Summary: System administration tools for monitoring users' disk usage Epoch: 1 Version: 4.00 -Release: 0.9.pre1%{?dist} +Release: 0.10.pre1%{?dist} License: BSD and GPLv2+ URL: http://sourceforge.net/projects/linuxquota/ Group: System Environment/Base @@ -64,6 +64,8 @@ Patch22: quota-4.00_pre1-Initialize-vfsold-block-and-inode-value-boundries-fo.pa Patch23: quota-4.00_pre1-Explain-meaning-of-the-second-column-in-repquota-out.patch # In upstream 4.00_pre2 Patch24: quota-4.00_pre1-Make-RPC-handle-properly-host-names-with-colons.patch +# Submitted to upstream, SF#3195046 +Patch25: quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch %description The quota package contains system administration tools for monitoring @@ -158,6 +160,7 @@ Linux/UNIX environment. %patch22 -p1 -b .inizialize_vfsold_boundries %patch23 -p1 -b .explain_second_column_of_repquota %patch24 -p1 -b .hostnames_with_columns +%patch25 -p1 -b .warnquota_domains # quotactl(2) moved into `man-pages' package (bug #640590) rm -f quotactl.2 # remove VCS files @@ -280,6 +283,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 28 2011 Petr Pisar - 1:4.00-0.10.pre1 +- Do not use real domains in warnquota example + * Thu Feb 17 2011 Petr Pisar - 1:4.00-0.9.pre1 - Explain meaning of the second column in repquota output - Make RPC handle properly host names with colons (i.e. IPv6 server host name)