commit b809fafa52771f6903d2d75a004f0133fc99e3c6 Author: Mikhail Kolesnik <mike@openbunker.org> Date: Wed Jun 27 18:43:21 2012 +0200 [notify] quota: update to 4.00 Note: ----- The location of the quota config-files has been moved from /etc/quota to /etc because a location other than /etc never has really worked. diff --git a/quota/.footprint b/quota/.footprint index 636c9a7..55e69eb 100644 --- a/quota/.footprint +++ b/quota/.footprint @@ -1,8 +1,7 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/quota/ --rw-r--r-- root/root etc/quota/quotagrpadmins --rw-r--r-- root/root etc/quota/quotatab --rw-r--r-- root/root etc/quota/warnquota.conf +-rw-r--r-- root/root etc/quotagrpadmins +-rw-r--r-- root/root etc/quotatab +-rw-r--r-- root/root etc/warnquota.conf drwxr-xr-x root/root sbin/ -r-xr-xr-x root/root sbin/quotacheck lrwxrwxrwx root/root sbin/quotaoff -> quotaon @@ -10,11 +9,11 @@ lrwxrwxrwx root/root sbin/quotaoff -> quotaon drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -r-xr-xr-x root/root usr/bin/quota +-r-xr-xr-x root/root usr/bin/quotasync drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -r--r--r-- root/root usr/man/man1/quota.1.gz drwxr-xr-x root/root usr/man/man2/ --r--r--r-- root/root usr/man/man2/quotactl.2.gz drwxr-xr-x root/root usr/man/man3/ -r--r--r-- root/root usr/man/man3/rquota.3.gz drwxr-xr-x root/root usr/man/man8/ diff --git a/quota/.md5sum b/quota/.md5sum index 2c19dad..4b68dde 100644 --- a/quota/.md5sum +++ b/quota/.md5sum @@ -1,2 +1,3 @@ -cb3e98a039c0cf98e7c1ad4b50a5bda7 quota-3.17.tar.gz -6b878d879c3c4a64d608a75a431f7de6 warnquota.conf +975f587ff761a60ac25dbe6c00865925 quota-4.00.tar.gz +b26ac767894bb8847215906da137ea68 quotagrpadmins +70fecd0bd0f9390dec10ce4d0ce7c3d7 warnquota.conf diff --git a/quota/Pkgfile b/quota/Pkgfile index 0e77f81..00bdba7 100644 --- a/quota/Pkgfile +++ b/quota/Pkgfile @@ -5,16 +5,16 @@ # Depends on: e2fsprogs tcp_wrappers name=quota -version=3.17 -release=2 +version=4.00 +release=1 source=(http://download.sourceforge.net/linuxquota/$name-$version.tar.gz \ - warnquota.conf) + warnquota.conf quotagrpadmins) build(){ cd $name-tools ./configure --prefix=/usr \ --mandir=/usr/man \ - --sysconfdir=/etc/quota \ + --sysconfdir=/etc \ --enable-nls=no \ --enable-altformat=yes \ --enable-rpc=yes \ @@ -24,6 +24,6 @@ build(){ make make install ROOTDIR=$PKG rm -r $PKG/usr/include - install -D -m 644 $SRC/warnquota.conf $PKG/etc/quota/warnquota.conf - find $PKG/etc/quota -type f | xargs sed -i 's|/etc|/etc/quota|' + install -D -m 644 $SRC/warnquota.conf $PKG/etc/warnquota.conf + install -D -m 644 $SRC/quotagrpadmins $PKG/etc/quotagrpadmins } diff --git a/quota/warnquota.conf b/quota/warnquota.conf index b703023..1bfa064 100644 --- a/quota/warnquota.conf +++ b/quota/warnquota.conf @@ -2,19 +2,25 @@ # ; ; and # type comments are allowed # and even blank lines +# values can be quoted, but they don't have to be -# values can be quoted: -MAIL_CMD = "/usr/sbin/sendmail -t" -FROM = "bas@localhost" -# but they don't have to be: -SUBJECT = Hey, user, clean up your account! -CC_TO = "sysadm@localhost" +# /usr/sbin/sendmail can be a symlink to compatible mail program +# (/var/lib/pkg/prt-get.aliases might provide some alternatives) +MAIL_CMD = "/usr/sbin/sendmail -t" + +FROM = "bas@example.com" + +SUBJECT = Hey, user, clean up your account! + +CC_TO = "sysadm@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 = "support@myhost.com" -PHONE = "(123) 456-1111 or (222) 333-4444" + +# this address also appears in Reply-To +SUPPORT = "support@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 # Line breaks are done by '|' character @@ -25,22 +31,28 @@ MESSAGE = Hello user %i, I've noticed you use too much space\ on my disk in %h.%d.|Delete your files on the following filesystems:| # Text in the end of the mail (if not specified, default text using SUPPORT and PHONE # is created) -SIGNATURE = See you!| Your admin of %h| + +SIGNATURE = See you!| Your admin of %h| # 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.|\ + +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:| # Text in the end of the mail to the group (if not specified, default text using SUPPORT # and PHONE is created). -GROUP_SIGNATURE = See you!| Your admin| -# + +GROUP_SIGNATURE = See you!| Your admin| + #If you are running warnquota on a mail server, and don't want bounces #because clients cannot receive mail setting this to "any" will cause #warnquota to not send them mail for all devices. If you set this to the #device name (for example /dev/hdb1) then they will not be sent mail if they #are overquota on that device only, and will be sent mail for all other #devices. -#MAILDEV = -# +#MAILDEV = + +#Here you can set a charset for emails sent by warnquota (e.g. UTF-8) +#CHARSET = + # If you are using LDAP mail lookups. # host, port, tls, binddn, and bindpw are straight forward. # LDAP_BASEDN is your search base dn @@ -49,11 +61,11 @@ GROUP_SIGNATURE = See you!| Your admin| # LDAP_DEFAULT_MAIL_DOMAIN is the default domain # if the attribute isn't found # if binddn and bindpw are blank or left out, an anonymous bind is used -# -# LDAP_MAIL = false # or false if you don't want to use it -# If you have at least LDAP 2.3 installed, you can use LDAP_URI +# +# 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 can specify LDAP_HOST and LDAP_PORT +# Otherwise you should specify LDAP_HOST and LDAP_PORT # LDAP_HOST = ldap # LDAP_PORT = 389 # LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg @@ -63,5 +75,4 @@ GROUP_SIGNATURE = See you!| Your admin| # LDAP_MAIL_ATTRIBUTE = mailLocalAddress # LDAP_DEFAULT_MAIL_DOMAIN = YourDefaultMailDomain.com # -# end of example warnquota.conf file -# +# end of /etc/warnquota.conf file