This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a4d751b147f166db76af073d8b34667a2633e786
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Fri Dec 15 11:59:37 2023 +0100
JAMES-3967 Store mails when relay is exceeded
This prevents data loss.
---
server/apps/cassandra-app/sample-configuration/mailetcontainer.xml | 4 +++-
server/apps/distributed-app/sample-configuration/mailetcontainer.xml | 4 +++-
.../distributed-pop3-app/sample-configuration/mailetcontainer.xml | 4 +++-
server/apps/jpa-app/sample-configuration/mailetcontainer.xml | 4 +++-
server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml | 4 +++-
server/apps/memory-app/sample-configuration/mailetcontainer.xml | 4 +++-
.../apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml | 4 +++-
server/apps/spring-app/src/main/resources/mailetcontainer.xml | 4 +++-
8 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
b/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
index 7bdb153d21..f9c62031f0 100644
--- a/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
@@ -37,7 +37,9 @@
<processors>
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>cassandra://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
diff --git
a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
index 7bdb153d21..f9c62031f0 100644
--- a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
@@ -37,7 +37,9 @@
<processors>
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>cassandra://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
diff --git
a/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
b/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
index 5aceaf4ef8..945deba91f 100644
--- a/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
@@ -37,7 +37,9 @@
<processors>
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>cassandra://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
diff --git a/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
b/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
index acc048b8a9..90cbcedef1 100644
--- a/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
@@ -37,7 +37,9 @@
<processors>
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>file://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
diff --git a/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
b/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
index a050bbea55..4360a22d81 100644
--- a/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
@@ -37,7 +37,9 @@
<processors>
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>file://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
diff --git a/server/apps/memory-app/sample-configuration/mailetcontainer.xml
b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
index 15a356398c..a05cf3ca74 100644
--- a/server/apps/memory-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
@@ -37,7 +37,9 @@
<processors>
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>memory://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
diff --git
a/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
b/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
index 97ab8ee993..f95729d6b7 100644
--- a/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
+++ b/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
@@ -32,7 +32,9 @@
<processors>
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>blob://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
diff --git a/server/apps/spring-app/src/main/resources/mailetcontainer.xml
b/server/apps/spring-app/src/main/resources/mailetcontainer.xml
index ce4c038c56..927b035857 100644
--- a/server/apps/spring-app/src/main/resources/mailetcontainer.xml
+++ b/server/apps/spring-app/src/main/resources/mailetcontainer.xml
@@ -57,7 +57,9 @@
<mailet match="All" class="PostmasterAlias"/>
<!-- Important check to avoid looping -->
- <mailet match="RelayLimit=30" class="Null"/>
+ <mailet match="RelayLimit=30" class="ToRepository">
+
<repositoryPath>file://var/mail/relay-limit-exceeded/</repositoryPath>
+ </mailet>
<!-- The WithPriority mailet allows to set a priority attribute on the
mail. If the
attribute is set and priority handling is enabled it will take
care of moving the
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
