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 6d8f0ede36584265b2b0b0087d188f89b07391ae..ee5dd9582325baec5042f79ca6bea06cb41bcce8 100644 (file)
--- 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 15ee1fad6b01189a94904d021a5e34e18692a997..e11dec0e677d041d06095dc635db4b4ff0a7969b 100644 (file)
--- 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 945fe55580a822e523f7121aec2fd6892f360f10..5f17bd64d95d685ed2f8f933fefeb96a8c5ee227 100644 (file)
--- 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 5fcb61d3145cf0fb08de4227b7cd0dc9b4e4524c..95827ea79adccdac8c8c4db1cd28396d1ec3a8a2 100644 (file)
--- 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 229ba1f11ce63be4c64580954c2f7b5cd90a30b8..e927a7484a5074bacdb839d62b11624ec0a4ea84 100644 (file)
--- 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 ebfb1c91431a40105b587921f790ed29988bcc80..99f830b848c9bc8513a6b1fe03f3187570441e64 100644 (file)
--- a/procmail/spool-all
+++ b/procmail/spool-all
@@ -1,2 +1,2 @@
 :0 c
-$INBOX/.spool/
+$BASE/.spool/