X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fmail-big-homedirs;h=d499d963cf62288d01a1f8aeee3a3a7b771b638b;hb=4b53b925b0cdae12ca5af476babe369851d6c936;hp=9971e83fc569cfeb5c2654b9efc1e0e7701eb1f8;hpb=b9db288f5da6a4406cab1e57c45db2120ca1b6bb;p=dsa-puppet.git diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs index 9971e83f..d499d963 100755 --- a/modules/porterbox/files/mail-big-homedirs +++ b/modules/porterbox/files/mail-big-homedirs @@ -3,7 +3,7 @@ # Send email reminders to users having sizable homedirs. ## # Copyright (c) 2013 Philipp Kern -# Copyright (c) 2013 Peter Palfrader +# Copyright (c) 2013, 2014 Peter Palfrader # Copyright (c) 2013 Luca Filipozzi # # Permission is hereby granted, free of charge, to any person obtaining a copy @@ -44,20 +44,17 @@ DRYRUN = False if DRYRUN: SENDMAIL_COMMAND = ['/bin/cat'] -else: - SENDMAIL_COMMAND = ['/usr/sbin/sendmail', '-t', '-oi'] - -if DRYRUN: RM_COMMAND = ['/bin/echo', 'Would remove'] else: + SENDMAIL_COMMAND = ['/usr/sbin/sendmail', '-t', '-oi'] RM_COMMAND = ['/bin/rm', '-rf'] CRITERIA = [ - { 'size': 10240, 'notifyafter': 5}, #, 'deleteafter': 40 }, - { 'size': 1024, 'notifyafter': 10}, #, 'deleteafter': 50 }, - { 'size': 100, 'notifyafter': 30}, #, 'deleteafter': 90 }, - { 'size': 20, 'notifyafter': 90}, #, 'deleteafter': 150 }, - { 'size': 5, 'deleteafter': 700 } + { 'size': 10240, 'notifyafter': 5, 'deleteafter': 40 }, + { 'size': 1024, 'notifyafter': 10, 'deleteafter': 50 }, + { 'size': 100, 'notifyafter': 30, 'deleteafter': 90 }, + { 'size': 20, 'notifyafter': 90, 'deleteafter': 150 }, + { 'size': 5, 'deleteafter': 700 } ] EXCLUDED_USERNAMES = ['lost+found', 'debian'] MAIL_FROM = 'debian-admin (via Cron) ' @@ -167,7 +164,6 @@ class HomedirReminder(object): def remove(self, **kwargs): try: pwinfo = pwd.getpwnam(kwargs.get('username')) - return except KeyError: return