summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-06-06 16:03:34 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-06-06 16:03:34 +0000
commit17f116c53e1d9f54d357ac1b02356d8c044ce112 (patch)
tree7ccb355d351aca854e3db07f746cc1a513f6af07 /etc
parente1e3103a9c37f3bacb74d469ddbb4976f8169615 (diff)
slight reshuffle to make this less confusing;
ok beck@
Diffstat (limited to 'etc')
-rw-r--r--etc/spamd.conf18
1 files changed, 9 insertions, 9 deletions
diff --git a/etc/spamd.conf b/etc/spamd.conf
index b25995f30e0..b95ac0deb58 100644
--- a/etc/spamd.conf
+++ b/etc/spamd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: spamd.conf,v 1.14 2005/06/05 13:51:39 jmc Exp $
+# $OpenBSD: spamd.conf,v 1.15 2005/06/06 16:03:33 jmc Exp $
#
# spamd config file, read by spamd-setup(8) for spamd(8)
#
@@ -66,14 +66,6 @@ korea:\
:method=http:\
:file=www.openbsd.org/spamd/koreacidr.txt.gz:
-# Whitelists are done like this, and must be added to "all" after each
-# blacklist from which you want the addresses in the whitelist removed.
-#
-#whitelist:\
-# :white:\
-# :method=file:\
-# :file=/var/mail/whitelist.txt:
-
#relaydb-black:\
# :black:\
# :msg="SPAM. Your address %A is in my relaydb list.":\
@@ -84,3 +76,11 @@ korea:\
# :white:\
# :method=exec:\
# :file=relaydb -4lw:
+
+# Whitelists are done like this, and must be added to "all" after each
+# blacklist from which you want the addresses in the whitelist removed.
+#
+#whitelist:\
+# :white:\
+# :method=file:\
+# :file=/var/mail/whitelist.txt: