JAMES-2529 Modernize default JMAP configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2dcde783 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2dcde783 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2dcde783 Branch: refs/heads/master Commit: 2dcde783134618cf92690aa697a281606a24d699 Parents: 9ba6a1d Author: Benoit Tellier <[email protected]> Authored: Wed Aug 29 14:11:00 2018 +0700 Committer: Antoine Duprat <[email protected]> Committed: Thu Aug 30 15:11:55 2018 +0200 ---------------------------------------------------------------------- .../resources/defaultJmapMailetContainer.xml | 21 ++++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2dcde783/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml b/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml index 4f70e72..713316e 100644 --- a/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml +++ b/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml @@ -31,8 +31,13 @@ <mailet match="All" class="Null"/> </processor> - <processor state="transport" enableJmx="false"> + <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or"> + <matcher match="SMTPAuthSuccessful"/> + <matcher match="SMTPIsAuthNetwork"/> + <matcher match="SentByMailet"/> + <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> + </matcher> <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> <name>X-UserIsAuth</name> <value>true</value> @@ -48,13 +53,7 @@ <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> </mailet> - <mailet match="SMTPAuthSuccessful" class="ToProcessor"> - <processor>relay</processor> - </mailet> - <mailet match="org.apache.james.jmap.mailet.SentByJmap" class="ToProcessor"> - <processor>relay</processor> - </mailet> - <mailet match="SentByMailet" class="ToProcessor"> + <mailet match="relay-allowed" class="ToProcessor"> <processor>relay</processor> </mailet> <mailet match="All" class="ToProcessor"> @@ -65,7 +64,7 @@ <processor state="relay" enableJmx="true"> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> - <delayTime>5000, 100000, 500000</delayTime> + <delayTime>5000, 100000, 23*500000</delayTime> <maxRetries>25</maxRetries> <maxDnsProblemRetries>0</maxDnsProblemRetries> <deliveryThreads>10</deliveryThreads> @@ -74,10 +73,6 @@ </mailet> </processor> - <processor state="spam" enableJmx="false"> - <mailet match="All" class="Null"/> - </processor> - <processor state="local-address-error" enableJmx="false"> <mailet match="All" class="Bounce"> <attachment>none</attachment> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
