Disabled SSLv[2-3] in default configuration.

[packages/exim.git] / exim4.conf

diff --git a/exim4.conf b/exim4.conf
index f2f5db72052d90782b2ee148d73d4e5eb65e02be..0b323e27567fea04deb9793dfe9709c2160b37fb 100644 (file)
--- a/exim4.conf
+++ b/exim4.conf
@@ -41,6 +41,10 @@
 #                    MAIN CONFIGURATION SETTINGS                     #
 ######################################################################
 
+# Log more information
+# log_selector = +all -arguments
+log_selector = +smtp_confirmation +queue_time
+
 # Specify your host's canonical name here. This should normally be the fully
 # qualified "official" name of your host. If this option is not set, the
 # uname() function is called to obtain the name. In many cases this does
@@ -48,6 +52,8 @@
 
 # primary_hostname =
 
+# daemon_smtp_ports = 25 : 465
+# tls_on_connect_ports = 465
 
 # The next three settings create two lists of domains and one list of hosts.
 # These lists are referred to later in this configuration using the syntax
@@ -194,18 +200,21 @@ never_users = root
 
 host_lookup = *
 
+# Advertise DSN for these hosts
+
+dsn_advertise_hosts = *
 
-# The settings below, which are actually the same as the defaults in the
-# code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP
-# calls. You can limit the hosts to which these calls are made, and/or change
-# the timeout that is used. If you set the timeout to zero, all RFC 1413 calls
+# The settings below (default is 30s) cause Exim to make RFC 1413 (ident)
+# callbacks for all incoming SMTP calls. You can limit the hosts to which
+# these calls are made, and/or change # the timeout that is used.
+# If you set the timeout to zero, all RFC 1413 calls
 # are disabled. RFC 1413 calls are cheap and can provide useful information
 # for tracing problem messages, but some hosts and firewalls have problems
 # with them. This can result in a timeout instead of an immediate refused
 # connection, leading to delays on starting up an SMTP session.
 
 rfc1413_hosts = *
-rfc1413_query_timeout = 30s
+rfc1413_query_timeout = 3s
 
 
 # By default, Exim expects all envelope addresses to be fully qualified, that
@@ -295,7 +304,7 @@ acl_check_rcpt:
 
   deny    message       = Restricted characters in address
           domains       = +local_domains
-          local_parts   = ^[.] : ^.*[@%!/|]
+          local_parts   = ^[.] : ^.*[@%!|]
 
   # The second rule applies to all other domains, and is less strict. This
   # allows your own users to send outgoing messages to sites that use slashes
@@ -308,7 +317,7 @@ acl_check_rcpt:
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains
-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
+          local_parts   = ^[.|] : ^.*[@%!] : ^.*/\\.\\./
   #############################################################################
 
   # Accept mail to postmaster in any local domain, regardless of the source,
@@ -499,8 +508,14 @@ system_aliases:
 
 # This router handles forwarding using traditional .forward files in users'
 # home directories. If you want it also to allow mail filtering when a forward
-# file starts with the string "# Exim filter", uncomment the "allow_filter"
-# option.
+# file starts with the string "# Exim filter" or "# Sieve filter", uncomment
+# the "allow_filter" option.
+
+# If you want this router to treat local parts with suffixes introduced by "-"
+# or "+" characters as if the suffixes did not exist, uncomment the two local_
+# part_suffix options. Then, for example, xxxx-foo@your.domain will be treated
+# in the same way as xxxx@your.domain by this router. You probably want to make
+# the same change to the localuser router.
 
 # The no_verify setting means that this router is skipped when Exim is
 # verifying addresses. Similarly, no_expn means that this router is skipped if
@@ -518,11 +533,13 @@ system_aliases:
 userforward:
   driver = redirect
   check_local_user
+# local_part_suffix = +* : -*
+# local_part_suffix_optional
   file = $home/.forward
+# allow_filter
   no_verify
   no_expn
   check_ancestor
-# allow_filter
   file_transport = address_file
   pipe_transport = address_pipe
   reply_transport = address_reply
@@ -541,9 +558,16 @@ userforward:
 # This router matches local user mailboxes. If the router fails, the error
 # message is "Unknown user".
 
+# If you want this router to treat local parts with suffixes introduced by "-"
+# or "+" characters as if the suffixes did not exist, uncomment the two local_
+# part_suffix options. Then, for example, xxxx-foo@your.domain will be treated
+# in the same way as xxxx@your.domain by this router.
+
 localuser:
   driver = accept
   check_local_user
+# local_part_suffix = +* : -*
+# local_part_suffix_optional
   transport = local_delivery
   cannot_route_message = Unknown user