From: martin f. krafft <madduck@seamus.madduck.net>
Date: Wed, 15 Aug 2007 14:08:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/mailfilter
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/6dc89cc5e53c022184fb14020dd89cbc5a2939fd?hp=0388b828a2e99944d75fc8d30a57ade1640fe8e6

Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/mailfilter
---

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 6d8f0ed..ee5dd95 100644
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -13,7 +13,7 @@
     SPAMTRAPPED
   }
 
-  DESTDIR="$INBOX/.admin.`echo $EQ_DOMAIN | tr . _"
+  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
 
   :0
   {
diff --git a/procmail/rules/debian b/procmail/rules/debian
index 15ee1fa..e11dec0 100644
--- a/procmail/rules/debian
+++ b/procmail/rules/debian
@@ -1,10 +1,10 @@
 :0
 * ^X-Debian-PR-Source: \/.+
 * ? grep -q "^${MATCH}$" $CONF/debian-packages
-$INBOX/.debian.$MATCH/
+$BASE/.debian.$MATCH/
 
 :0
 * ORIGINAL_TO ?? ^madduck=debian\.org@forward\.madduck\.net$
-$INBOX/.debian/
+$BASE/.debian/
 
 # vim:ft=procmail
diff --git a/procmail/rules/feeds b/procmail/rules/feeds
index 945fe55..5f17bd6 100644
--- a/procmail/rules/feeds
+++ b/procmail/rules/feeds
@@ -1,7 +1,7 @@
 :0
 * ORIG_DOMAIN ?? ^r2e\.madduck\.net$
 {
-  DESTDIR=$INBOX/.feeds
+  DESTDIR=$BASE/.feeds
 
   :0
   ${DESTDIR}/
diff --git a/procmail/rules/mass b/procmail/rules/mass
index 5fcb61d..95827ea 100644
--- a/procmail/rules/mass
+++ b/procmail/rules/mass
@@ -1,7 +1,7 @@
 :0
 * ORIG_DOMAIN ?? ^mass\.madduck\.net$
 {
-  DESTDIR=$INBOX/.mass
+  DESTDIR=$BASE/.mass
 
   :0
   ${DESTDIR}/
diff --git a/procmail/rules/sudetia b/procmail/rules/sudetia
index 229ba1f..e927a74 100644
--- a/procmail/rules/sudetia
+++ b/procmail/rules/sudetia
@@ -1,5 +1,5 @@
 :0
 * ORIGINAL_TO ?? ^madduck=sudetia.de@forward\.madduck\.net$
-$INBOX/.sudetia/
+$BASE/.sudetia/
 
 # vim:ft=procmail
diff --git a/procmail/spool-all b/procmail/spool-all
index ebfb1c9..99f830b 100644
--- a/procmail/spool-all
+++ b/procmail/spool-all
@@ -1,2 +1,2 @@
 :0 c
-$INBOX/.spool/
+$BASE/.spool/