X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.procmailrc;h=865113df454f06f36c02129850da2b44231ddc2d;hb=HEAD;hp=c477e8c8b1b437856c944ee420c5742230570ac0;hpb=343cc4434087d44e6e89959cf2869d0d9fce7e4c;p=remote_mail.git

diff --git a/.procmailrc b/.procmailrc
index c477e8c..865113d 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -1,3 +1,4 @@
+# -*- mode: tinyprocmail -*-
 PATH=/bin:/usr/bin:/usr/X11R6/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin
 
 SHELL=/bin/bash
@@ -66,36 +67,17 @@ FRIENDS=$HOME/.procmail/friends
 * ^Subject:.*Cron.*debbugs@master
 /dev/null
 
+# subaru
+:0:
+* 1^0 ^Subject: Your Crosstrek has started charging
+* 1^0 ^Subject: Charging for your Crosstrek is complete
+subaru/
 
-# Handle delay messages
-:0 Hc
-* !Message-Id: .*delay[0-9]+@
-* ^TO \/don\+delay\+[^@]+
-$HOME/Mail/delay
-
-:0 Hhbw
-* !Message-Id: .*delay[0-9]+@
-* ^TO \/don\+delay\+[^@]+
-|/home/don/bin/delay_mail --mailto don@donarmstrong.com --enqueue --email --delay $MATCH
-
-# Convert old-style PGP messages to MIME
-:0
-* !^Content-Type: multipart/
-* !^Content-Type: application/pgp
-{
-    :0 fBw
-    * ^-----BEGIN PGP MESSAGE-----
-    * ^-----END PGP MESSAGE-----
-    | formail \
-        -i "Content-Type: application/pgp; format=text; x-action=encrypt"
-
-    :0 fBw
-    * ^-----BEGIN PGP SIGNED MESSAGE-----
-    * ^-----BEGIN PGP SIGNATURE-----
-    * ^-----END PGP SIGNATURE-----
-    | formail \
-        -i "Content-Type: application/pgp; format=text; x-action=sign"
-}
+# Daycare emails
+:0:
+* 1^0 ^Subject: Cottage Kids Children's Center Check-
+* 1^0 ^Subject: Bright Path to Learning Child Development Center
+daycare/
 
 :0:
 * ! ? (formail -x From: -x Sender: | fgrep -iqf $FRIENDS)
@@ -118,19 +100,6 @@ $HIGHSPAM
 * ^X-Spam-Status: Yes
 $SPAM
 
-
-# I get joe-jobbed a lot; if a message is from a mailer, but not from
-# one of mine, discard it.
-:0:
-* (^(((Resent-)?(From|Sender)|X-Envelope-From):|>?From )([^>]*[^(.%@a-z0-9])?(Post(ma(st(er)?|n)|office)|(send)?Mailer|daemon|mmdf|n?uucp|ops|r(esponse|oot)|(bbs\.)?smtp(error)?|(s(erver)|ystem)|A(dmin(istrator)?|MMGR))(([^).!:a-z0-9][-_a-z0-9]*)?[%@>\t ][^<)]*(\(.*\).*)?)?$([^>]|$)
-* ^Subject:.*(Mail delivery failed|Returned mail|Undelivered Mail)
-* !^From:.+(ucr|debian|donarmstrong|sndservers|ccin|schedulesdirect|prometheuslabor.com)
-* !^From:.+(schedulesdirect|paypal.com)
-* !^To:.+ (don\+.+\@(donarmstrong\.com|debian\.org|rzlab\.ucr\.edu))
-* !^List-.+
-* !^X-Diagnostic:
-$JOEJOB
-
 }
 
 # discard bounces from dumb mailing lists on prometheuslabor
@@ -140,6 +109,12 @@ $JOEJOB
 * ^Subject:.*Undelivered
 /dev/null
 
+# Discard bounces from lists.acbnrates.com
+:0:
+* ^To: mailman-bounces@lists.acbnrates.com
+* ^Subject:.*Undelivered
+/dev/null
+
 # discard AQMD mail
 :0:
 * ^From: usc.aqmd@usc.edu
@@ -162,6 +137,11 @@ $POSTMASTER
 * ^From:.*rgm@gnu.org
 $HOME/Mail/idiots
 
+# Send messages from sacramento city unified to Laurel
+:0:cr
+* ^From:.*DoNotReply@scusd.edu
+| /usr/lib/sendmail lkdwillow@gmail.com
+
 # Work around procmail bug: any output on stderr will cause the "F" in "From"
 # to be dropped.  This will re-add it.
 :0 H
@@ -206,7 +186,7 @@ chili_alarm/
 * ^From:\ nagios@nagios-global.lab.propel.com
 chili_alarm/
 
-#
+# Mail from dragongo
 :0:
 * ^From:\ noreply@dragongoserver.net
 lists/dragongo/
@@ -261,19 +241,19 @@ lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
 # Debian's bug system uses X-Loop
 :0:
 * ^X-PTS-Package: \/.+
-bugs/bug_reports
+bugs/bug_reports/
 
 :0:
 * ^X-Debian-PR-Source: \/.+
-bugs/bug_reports
+bugs/bug_reports/
 
 :0:
 * ^X-Debian-PR-Package: \/.+
-bugs/bug_reports
+bugs/bug_reports/
 
 :0:
 * ^X-Loop: owner@bugs.debian.org
-bugs/bug_reports
+bugs/bug_reports/
 
 :0:
 * X-Loop: \/[^@]+
@@ -306,6 +286,10 @@ lists/gene-arrays/
 * ^Sender:.*scd-bounce@blars.org
 lists/scd/
 
+:0:
+* ^Sender:.*journal@usgo.org
+lists/usgo/
+
 # broken lists using win32 software and NO LIST HEADER. Dumb.
 :0:
 * ^Sender: (Bugtraq|Incidents Mailing|VULN-DEV) List