- Update patch quota-4.01-warnquota.patch to match up the git
version that was integrated bsc#1144265 OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=63
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
4a522269fb
commit
00ed95eb1d
@ -1,7 +1,17 @@
|
||||
Index: warnquota.conf
|
||||
===================================================================
|
||||
--- warnquota.conf.orig
|
||||
+++ warnquota.conf
|
||||
From 0efb2331f1c39c9665fb6e92e83c7d080b877de1 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Kara <jack@suse.cz>
|
||||
Date: Mon, 1 Apr 2019 17:28:34 +0200
|
||||
Subject: [PATCH] warnquota: Improve examples in warnquota.conf
|
||||
|
||||
Signed-off-by: Jan Kara <jack@suse.cz>
|
||||
---
|
||||
warnquota.conf | 104 ++++++++++++++++++++++++++++++++++---------------
|
||||
1 file changed, 72 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/warnquota.conf b/warnquota.conf
|
||||
index b06f81f..60b0672 100644
|
||||
--- a/warnquota.conf
|
||||
+++ b/warnquota.conf
|
||||
@@ -1,21 +1,37 @@
|
||||
-# this is an example warnquota.conf
|
||||
+###################################################################
|
||||
@ -19,15 +29,10 @@ Index: warnquota.conf
|
||||
+
|
||||
+#
|
||||
+# Comment this out or remove it once you have edited this config file
|
||||
+#
|
||||
+FAIL = "configure /etc/warnquota.conf before running warnquota"
|
||||
+
|
||||
#
|
||||
-; ; and # type comments are allowed
|
||||
-# and even blank lines
|
||||
+# command used for sending mails
|
||||
+#
|
||||
+MAIL_CMD ▷⋅= "/usr/lib/sendmail -t"
|
||||
+FAIL = "configure /etc/warnquota.conf before running warnquota"
|
||||
|
||||
-# values can be quoted:
|
||||
-#MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
|
||||
@ -37,6 +42,11 @@ Index: warnquota.conf
|
||||
-SUBJECT = Hey, user, clean up your account!
|
||||
-CC_TO = "sysadm@example.com"
|
||||
+#
|
||||
+# command used for sending mails
|
||||
+#
|
||||
+MAIL_CMD = "/usr/lib/sendmail -t"
|
||||
+
|
||||
+#
|
||||
+# Standard mail fields
|
||||
+FROM = "root@localhost"
|
||||
+SUBJECT = "Your account quota has exceeded!"
|
||||
@ -52,7 +62,7 @@ Index: warnquota.conf
|
||||
# Text in the beginning of the mail (if not specified, default text is used)
|
||||
# This way text can be split to more lines
|
||||
# Line breaks are done by '|' character
|
||||
@@ -45,33 +61,27 @@ GROUP_SIGNATURE = See you!| Your admin
|
||||
@@ -45,33 +61,57 @@ GROUP_SIGNATURE = See you!| Your admin|
|
||||
#
|
||||
#Here you can set a charset for emails sent by warnquota (e.g. UTF-8)
|
||||
#CHARSET =
|
||||
@ -70,27 +80,19 @@ Index: warnquota.conf
|
||||
-#
|
||||
-# LDAP_MAIL = false # or true if you want to use it
|
||||
-# If you have at least LDAP 2.3 installed, you should use LDAP_URI
|
||||
-# LDAP_URI = ldaps://my.server:389
|
||||
-# Otherwise you should specify LDAP_HOST and LDAP_PORT
|
||||
-# LDAP_HOST = ldap
|
||||
-# LDAP_PORT = 389
|
||||
-# LDAP_TLS = false (false|never|allow|try|demand) use StarTLS
|
||||
-# false - don't use starTLS
|
||||
-# never - don't ask for a certificate
|
||||
-# allow - request certificate, proceed even if not verified
|
||||
-# try - request certificate, terminate if bad, proceed if not sent
|
||||
-# demand - request certificate, proceed only if verified
|
||||
-# LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg
|
||||
-# LDAP_BINDPW = YourReadOnlyUserPassword
|
||||
-# LDAP_BASEDN = YourSearchBase
|
||||
-# LDAP_SEARCH_ATTRIBUTE = uid
|
||||
-# LDAP_MAIL_ATTRIBUTE = mailLocalAddress
|
||||
-# LDAP_DEFAULT_MAIL_DOMAIN = YourDefaultMailDomain.com
|
||||
+##############################################################
|
||||
+# Your search base dn
|
||||
+#
|
||||
+# LDAP_BASEDN
|
||||
+
|
||||
+# Your search bind dn
|
||||
+#
|
||||
+# LDAP_BINDDN
|
||||
+
|
||||
+# Your search bind password
|
||||
+#
|
||||
+# LDAP_BINDPW
|
||||
+
|
||||
+# The attr for the value you are looking for
|
||||
+#
|
||||
+# LDAP_SEARCH_ATTRIBUTE
|
||||
@ -102,7 +104,42 @@ Index: warnquota.conf
|
||||
+# The default domain if the attribute isn't found
|
||||
+#
|
||||
+# LDAP_DEFAULT_MAIL_DOMAIN
|
||||
+
|
||||
+# Whether LDAP support should be used
|
||||
+#
|
||||
+# LDAP_MAIL = false
|
||||
+
|
||||
+# Ldap server. For LDAP >= 2.3 use
|
||||
+#
|
||||
# LDAP_URI = ldaps://my.server:389
|
||||
-# Otherwise you should specify LDAP_HOST and LDAP_PORT
|
||||
-# LDAP_HOST = ldap
|
||||
+#
|
||||
+# For older LDAP libraries use
|
||||
+#
|
||||
+# LDAP_HOST = my.server
|
||||
# LDAP_PORT = 389
|
||||
-# LDAP_TLS = false (false|never|allow|try|demand) use StarTLS
|
||||
-# false - don't use starTLS
|
||||
+
|
||||
+# TLS handling for the connection
|
||||
+#
|
||||
+# LDAP_TLS = (false|never|allow|try|demand)
|
||||
+# false - don't use start TLS
|
||||
# never - don't ask for a certificate
|
||||
# allow - request certificate, proceed even if not verified
|
||||
# try - request certificate, terminate if bad, proceed if not sent
|
||||
# demand - request certificate, proceed only if verified
|
||||
-# LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg
|
||||
-# LDAP_BINDPW = YourReadOnlyUserPassword
|
||||
-# LDAP_BASEDN = YourSearchBase
|
||||
-# LDAP_SEARCH_ATTRIBUTE = uid
|
||||
-# LDAP_MAIL_ATTRIBUTE = mailLocalAddress
|
||||
-# LDAP_DEFAULT_MAIL_DOMAIN = YourDefaultMailDomain.com
|
||||
+
|
||||
#
|
||||
# end of example warnquota.conf file
|
||||
#
|
||||
--
|
||||
2.22.0
|
||||
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 12 14:58:32 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Update patch quota-4.01-warnquota.patch to match up the git
|
||||
version that was integrated bsc#1144265
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 2 10:25:33 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
|
||||
@ -65,7 +65,7 @@ The quotad init script, which provides quota support on NFS mounts.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch2
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user