X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/90b680896df34b1a64d4541ceea5491a58136558..8d85c8e0dac8fc73e7e15d811fa6b1db8eed79b0:/procmail/rules/admin

diff --git a/procmail/rules/admin b/procmail/rules/admin
index ee5dd95..e8dd402 100644
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -1,29 +1,34 @@
 :0
 * ORIG_DOMAIN ?? ^admin\.madduck\.net$
 {
+  DEST=admin
+  DELAY
+
   # require that messages sent to foo=bar@admin.madduck.net have passed the
-  # machine at bar, meaning have been Delivered-To there.
+  # machine at bar, meaning have been Delivered-To there, or originating from
+  # there:
   :0
   *$ !^Delivered-To: .+@$EQ_DOMAIN
+  *$ !^Received:$RE_SPACE+by $EQ_DOMAIN
   {
-    LOG="spamtrap message as it was never delivered to $EQ_DOMAIN
-"
+    LOG="rules/admin: spamtrap message as never passed $EQ_DOMAIN$NL"
     :0 fw
-    |$FORMAIL -A'X-Spamtrapped: not delivered to eqdomain'
-    SPAMTRAPPED
+    |$FORMAIL -A"X-Spamtrapped: never passed eqdomain"
+    RETRAIN=spam
+    INCLUDERC=$PMDIR/handlespam
   }
 
-  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
-
-  :0
-  {
-    :0
-    * EQ_LOCAL ?? (logcheck|apticron)
-    ${DESTDIR}.$EQ_LOCAL/
-
-    :0
-    ${DESTDIR}/
-  }
+#  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
+#
+#  :0
+#  {
+#    :0
+#    * EQ_LOCAL ?? (logcheck|apticron)
+#    ${DESTDIR}.$EQ_LOCAL/
+#
+#    :0
+#    ${DESTDIR}/
+#  }
 }
 
 # vim:ft=procmail