From 475587264a2c91087a380868bfb3cb615f0b463b Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 12 Jan 2014 19:28:53 +0100 Subject: [PATCH] Start cleaning out homedirs automatically, as announced --- modules/porterbox/files/mail-big-homedirs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs index 0ece7c56..5113f46f 100755 --- a/modules/porterbox/files/mail-big-homedirs +++ b/modules/porterbox/files/mail-big-homedirs @@ -50,11 +50,11 @@ else: 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) ' @@ -164,7 +164,6 @@ class HomedirReminder(object): def remove(self, **kwargs): try: pwinfo = pwd.getpwnam(kwargs.get('username')) - return except KeyError: return -- 2.39.2