From 96cc004ee0a3dd1f32cf8386f1c10577d423eec9 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 19 Sep 2008 17:34:01 +0200
Subject: [PATCH] Reorder conf.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 example/postlicyd.conf | 91 +++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/example/postlicyd.conf b/example/postlicyd.conf
index 075d82a..1c2c6ba 100644
--- a/example/postlicyd.conf
+++ b/example/postlicyd.conf
@@ -40,6 +40,18 @@
 #  - a list of type-specific parameters
 #  - a list of hooks (on_hookname)
 #
+# Format:
+#  A filter look likes that:
+#
+#  filter_name {
+#    type = type_name;
+#    param1 = parameter value 1;
+#    ...
+#    on_hook1 = action1;
+#    on_hook2 = action2;
+#    ...
+#  }
+#
 # Hooks:
 #   A filter can returns different values. Each return value is given a name. The
 #   configuration associates an action to run to a return value name.
@@ -68,7 +80,25 @@
 #           - If the score is strictly greater >= than hard_threshold, returns hard_match
 #           - If the score is strictly greater >= than soft_threshold, returns soft_match
 #           - Else, returns fail
-#
+
+# Lookup in a rbl
+spamhaus_and_abuseat {
+  type   = iplist;
+
+  # configuration
+  file   = lock:10:/var/spool/postlicyd/rbl.spamhaus.org;
+  file   = lock:1:/var/spool/postlicyd/cbl.abuseat.org;
+  soft_threshold = 1;
+  hard_threshold = 11;
+
+  # hooks
+  on_soft_match = greylist;
+  on_hard_match = postfix:REJECT optional text;
+  on_fail       = postfix:OK;
+  on_error      = postfix:DUNNO;
+}
+
+
 #     - strlist: match strings from the query against a list of list.
 #        Parameters:
 #           - file: (non)?lock:(pre|suf)fix:weight:filename
@@ -103,7 +133,21 @@
 #           (smtpd_sender_restrictions)
 #           - to match recipient, you must on RCPT state (stmpd_recipient_restrictions)
 #           - client_name and reverse_client_name are always available
-#
+
+# Whitelist some clients
+client_whitelist {
+  type  = strlist;
+
+  # configuration
+  file    = lock:1:/var/spool/postlicyd/client_whitelist;
+  fields  = client_name;
+
+  # hooks
+  on_hard_match = postfix:OK;
+  on_fail       = spamhaus_and_abuseat;
+}
+
+
 #     - greylist: greylister
 #        Paramters:
 #           - path: /my/path/ (required)
@@ -126,17 +170,6 @@
 #         State:
 #           this filter is a recipient filter and works in RCPT state only
 #           (smtpd_recipient_restrictions).
-#
-# Format:
-#  A filter look likes that:
-#
-#  filter_name {
-#    type = type_name;
-#    param1 = parameter value 1;
-#    ...
-#    on_action1 = action;
-#  }
-
 
 # Perform greylisting
 greylist {
@@ -152,38 +185,6 @@ greylist {
 }
 
 
-# Lookup in a rbl
-spamhaus_and_abuseat {
-  type   = iplist;
-
-  # configuration
-  file   = lock:10:/var/spool/postlicyd/rbl.spamhaus.org;
-  file   = lock:1:/var/spool/postlicyd/cbl.abuseat.org;
-  soft_threshold = 1;
-  hard_threshold = 11;
-
-  # hooks
-  on_soft_match = greylist;
-  on_hard_match = postfix:REJECT optional text;
-  on_fail       = postfix:OK;
-  on_error      = postfix:DUNNO;
-}
-
-
-# Whitelist some clients
-client_whitelist {
-  type  = strlist;
-
-  # configuration
-  file    = lock:1:/var/spool/postlicyd/client_whitelist;
-  fields  = client_name;
-
-  # hooks
-  on_hard_match = postfix:OK;
-  on_fail       = spamhaus_and_abuseat;
-}
-
-
 # ENTRY POINTS
 #
 # Access policy daemon can be used at several protocol states. For each of this states,
-- 
2.20.1