X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fmail-big-homedirs;h=5113f46f0165762e42875bd37f181316552286db;hb=52bd6246ce28db656f0c7750b03bdb415f6fdbb6;hp=e957edabede1e7cffcf5cbc3ae4e1e0ad9a50aae;hpb=94dd52a059fa99cc26f18c6843415ddfbe9e669e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index e957edabe..5113f46f0 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -24,8 +24,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from __future__ import print_function
-
 from collections import defaultdict
 import email
 import email.mime.text
@@ -46,22 +44,19 @@ 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,  'notifyafter':  0,    'deleteafter': 450 }
+    { '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']
+EXCLUDED_USERNAMES = ['lost+found', 'debian']
 MAIL_FROM = 'debian-admin (via Cron) <bulk@admin.debian.org>'
 MAIL_TO = '{username}@{hostname}.debian.org'
 MAIL_CC = 'debian-admin (bulk sink) <bulk@admin.debian.org>'
@@ -169,7 +164,6 @@ class HomedirReminder(object):
   def remove(self, **kwargs):
     try:
       pwinfo = pwd.getpwnam(kwargs.get('username'))
-      return
     except KeyError:
       return