Update defaults for Amavisd local_domains and tweakage

1 files changed, 113 insertions, 111 deletions

diff --git a/Administrator_Guide/en-US/Combating_Spam.xml b/Administrator_Guide/en-US/Combating_Spam.xml
index ea5dacf..cd00ca2 100644
--- a/Administrator_Guide/en-US/Combating_Spam.xml
+++ b/Administrator_Guide/en-US/Combating_Spam.xml
@@ -530,40 +530,69 @@ bayes_sql_override_username  root</screen>
             Normally only inbound traffic is tagged &ndash;if at all&ndash;, by recognizing the recipient domain name space as local. The setting <literal>@local_domains</literal> or, in later versions of Amavis, <literal>@local_domains_acl</literal> is used.
         </para>
         <para>
-            To recognize all domain name spaces as local, edit <filename>/etc/amavisd/amavisd.conf</filename> and make sure the following settings are not configured:
+            In a default Kolab Groupware installation, the recipients are looked up in LDAP, and if an entry is found, Amavisd will also classify the domain as local &ndash; regardless of any <literal>@local_domains</literal> and/or <literal>@local_domains_acl</literal> setting.
         </para>
-        <para>
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        <literal>@local_domains</literal>,
-                    </para>
+        <section id="sect-Administrator_Guide-Ensuring_Availability_of_Messages_Spam_Score-Adding_Spam_Headers_to_All_Messages">
+            <title>Adding Spam Headers to All Messages</title>
+            <para>
+                To recognize all domain name spaces as local, edit <filename>/etc/amavisd/amavisd.conf</filename> and make sure the following settings are not configured:
+            </para>
+            <para>
+                <itemizedlist>
+                    <listitem>
+                        <para>
+                            <literal>@local_domains</literal>,
+                        </para>
 
-                </listitem>
-                <listitem>
-                    <para>
-                        <literal>@local_domains_acl</literal>, and
-                    </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <literal>@local_domains_acl</literal>, and
+                        </para>
 
-                </listitem>
-                <listitem>
-                    <para>
-                        any <literal>read_hash(\%local_domains)</literal> setting.
-                    </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            any <literal>read_hash(\%local_domains)</literal> setting.
+                        </para>
 
-                </listitem>
+                    </listitem>
 
-            </itemizedlist>
+                </itemizedlist>
 
-        </para>
-        <para>
-            Ensure that the following setting is configured like so:
-        </para>
-        <para>
+            </para>
+            <para>
+                Ensure that the following setting is configured like so:
+            </para>
+            <para>
 
 <screen language="Perl">$local_domains_re = new_RE( qr'.*' );</screen>
 
-        </para>
+            </para>
+            <para>
+                Also disable the LDAP lookups, by removing the following settings:
+            </para>
+            <para>
+                <itemizedlist>
+                    <listitem>
+                        <para>
+                            <literal>$enable_ldap</literal>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <literal>$default_ldap</literal>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </section>
+
 
     </section>
 
@@ -583,34 +612,7 @@ bayes_sql_override_username  root</screen>
             <orderedlist>
                 <listitem>
                     <para>
-                        Are intended for delivery to recipients in local domain name spaces,
-                    </para>
-                    <para>
-                        The list of local domain name spaces Amavisd uses is configured using any of the following settings in <filename>/etc/amavisd/amavisd.conf</filename>:
-                    </para>
-                    <para>
-                        <itemizedlist>
-                            <listitem>
-                                <para>
-                                    <literal>@local_domains</literal>,
-                                </para>
-
-                            </listitem>
-                            <listitem>
-                                <para>
-                                    <literal>@local_domains_acl</literal>,
-                                </para>
-
-                            </listitem>
-                            <listitem>
-                                <para>
-                                    <literal>read_hash(\%local_domains)</literal>
-                                </para>
-
-                            </listitem>
-
-                        </itemizedlist>
-
+                        Are intended for delivery to local recipients,
                     </para>
 
                 </listitem>
@@ -635,87 +637,87 @@ bayes_sql_override_username  root</screen>
 
         </formalpara>
         <para>
-            Depending on your platform, the default for this score is <literal>6.31</literal> or <literal>6.9</literal>. When a message is marked with a spam score higher than or equal to this level, Amavisd will take "evasive action". See <xref linkend="sect-Administrator_Guide-Default_Amavisd_Behaviour-Configuring_Evasive_Action" /> for more information on configuring evasive actions.
+            Depending on your platform, the default for this score is <literal>6.31</literal> or <literal>6.9</literal>. When a message is marked with a spam score higher than or equal to this level, Amavisd will take "evasive action". See <xref linkend="sect-Administrator_Guide-Combating_Spam-Configuring_Amavis_Evasive_Action" /> for more information on configuring evasive actions.
         </para>
-        <section id="sect-Administrator_Guide-Default_Amavisd_Behaviour-Configuring_Evasive_Action">
-            <title>Configuring Evasive Action</title>
-            <para>
-                You can control what "evasive action" Amavisd takes using the <literal>$final_spam_destiny</literal> and <literal>$final_virus_destiny</literal> settings in <filename>/etc/amavisd/amavisd.conf</filename>. The default is usually to discard the message, but the following options are available:
-            </para>
-            <para>
-                <itemizedlist>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Configuring_Evasive_Action-D_PASS">
-                            <title>D_PASS</title>
-                            <para>
-                                The message is accepted for delivery to the intended recipient(s), despite having been scored passed the kill or cutoff level, and regardless of bad content.
-                            </para>
 
-                        </formalpara>
+    </section>
+
+    <section id="sect-Administrator_Guide-Combating_Spam-Configuring_Amavis_Evasive_Action">
+        <title>Configuring Amavis Evasive Action</title>
+        <para>
+            You can control what "evasive action" Amavisd takes using the <literal>$final_spam_destiny</literal> and <literal>$final_virus_destiny</literal> settings in <filename>/etc/amavisd/amavisd.conf</filename>. The default is usually to discard the message, but the following options are available:
+        </para>
+        <para>
+            <itemizedlist>
+                <listitem>
+                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_PASS">
+                        <title>D_PASS</title>
                         <para>
-                            If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                            The message is accepted for delivery to the intended recipient(s), despite having been scored passed the kill or cutoff level, and regardless of bad content.
                         </para>
 
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Configuring_Evasive_Action-D_BOUNCE">
-                            <title>D_BOUNCE</title>
-                            <para>
-                                The message is not accepted for delivery to the intended recipient(s). A Delivery Status Notification stating delivery failure is sent out to the sender.
-                            </para>
+                    </formalpara>
+                    <para>
+                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                    </para>
 
-                        </formalpara>
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_BOUNCE">
+                        <title>D_BOUNCE</title>
                         <para>
-                            If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                            The message is not accepted for delivery to the intended recipient(s). A Delivery Status Notification stating delivery failure is sent out to the sender.
                         </para>
 
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Configuring_Evasive_Action-D_REJECT">
-                            <title>D_REJECT</title>
-                            <para>
-                                The message is rejected by Amavisd, and while Amavisd sends out a 550 SMTP response to the Mail Transfer Agent, said Mail Transfer Agent is responsible for sending out the Delivery Status Notification, if any.
-                            </para>
+                    </formalpara>
+                    <para>
+                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                    </para>
 
-                        </formalpara>
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_REJECT">
+                        <title>D_REJECT</title>
                         <para>
-                            If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                            The message is rejected by Amavisd, and while Amavisd sends out a 550 SMTP response to the Mail Transfer Agent, said Mail Transfer Agent is responsible for sending out the Delivery Status Notification, if any.
                         </para>
 
-                    </listitem>
-                    <listitem>
-                        <formalpara id="form-Administrator_Guide-Configuring_Evasive_Action-D_DISCARD">
-                            <title>D_DISCARD</title>
-                            <para>
-                                The message is simply discarded by Amavisd. The sending Mail Transfer Agent will receive a positive SMTP delivery response, and Amavisd sends out no Delivery Status Notification, nor does it forward the message for delivery to the intended recipients.
-                            </para>
+                    </formalpara>
+                    <para>
+                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                    </para>
 
-                        </formalpara>
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-D_DISCARD">
+                        <title>D_DISCARD</title>
                         <para>
-                            If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                            The message is simply discarded by Amavisd. The sending Mail Transfer Agent will receive a positive SMTP delivery response, and Amavisd sends out no Delivery Status Notification, nor does it forward the message for delivery to the intended recipients.
                         </para>
 
-                    </listitem>
+                    </formalpara>
+                    <para>
+                        If a quarantine address has been configured, the quarantine address will receive a copy of the email. See <xref linkend="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine" /> to learn how to configure the quarantine address.
+                    </para>
 
-                </itemizedlist>
+                </listitem>
 
-            </para>
-            <formalpara id="form-Administrator_Guide-Configuring_Evasive_Action-Configuring_Quarantine">
-                <title>Configuring Quarantine</title>
-                <para>
-                    Two separate quarantine forwarding addresses can be configured. One is for messages labeled as spam, another for messages suspected to contain a virus.
-                </para>
+            </itemizedlist>
 
-            </formalpara>
-            <para>
-                A catchall address for spam can be configured by setting the <literal>$spam_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>
-            </para>
+        </para>
+        <formalpara id="form-Administrator_Guide-Configuring_Amavis_Evasive_Action-Configuring_Quarantine">
+            <title>Configuring Quarantine</title>
             <para>
-                A catchall address for messages suspected of containing a virus can be configured by setting the <literal>$virus_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>.
+                Two separate quarantine forwarding addresses can be configured. One is for messages labeled as spam, another for messages suspected to contain a virus.
             </para>
 
-        </section>
-
+        </formalpara>
+        <para>
+            A catchall address for spam can be configured by setting the <literal>$spam_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>
+        </para>
+        <para>
+            A catchall address for messages suspected of containing a virus can be configured by setting the <literal>$virus_quarantine_to</literal> setting to a valid recipient address in <filename>/etc/amavisd/amavisd.conf</filename>.
+        </para>
 
     </section>