You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/05/25 10:49:18 UTC
[james-project] branch 3.5.x created (now ba532d0)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git.
at ba532d0 Remove leading line breaks
This branch includes the following new commits:
new 492e458 JAMES-1541 Remove no longer existing TarpitHandler from configuration
new 04e8ec7 JAMES-1541 Remove no longer existing SuppressDuplicateRcptHandler from configuration
new 537af6e JAMES-1541 Fix a typo in MailPriorityHandler in configuration
new 3b4828c JAMES-3187 Add webadmin enabled by default to jpa-guice docker image
new 2207d8b JAMES-3187 Provisionned docker: add a cli helper script
new ba532d0 Remove leading line breaks
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/06: JAMES-1541 Remove no longer existing
TarpitHandler from configuration
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 492e458cda31509e9f894fdf9d7acbafc3bd771e
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue May 19 08:45:15 2020 +0700
JAMES-1541 Remove no longer existing TarpitHandler from configuration
---
server/app/src/main/resources/smtpserver.xml | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/server/app/src/main/resources/smtpserver.xml b/server/app/src/main/resources/smtpserver.xml
index a26a06a..d0a5637 100644
--- a/server/app/src/main/resources/smtpserver.xml
+++ b/server/app/src/main/resources/smtpserver.xml
@@ -247,17 +247,6 @@
<whitelistedNetworks>127.0.0.0/8</whitelistedNetworks>
</handler>
-->
-
- <!-- Tarpitting is a method to insert a small sleep after each rcpt. For more -->
- <!-- infos read this: http://www.palomine.net/qmail/tarpit.html . -->
- <!-- Default is set to 0 (disabled). -->
- <!-- You can also configure the time to sleep in milliseconds -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.TarpitHandler">
- <tarpitRcptCount>5</tarpitRcptCount>
- <tarpitSleepTime>5000</tarpitSleepTime>
- </handler>
- -->
<!-- This handler ignore duplicated recipients per session. So the email will get only send on time even -->
<!-- if the recipient is specified more then once -->
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/06: JAMES-1541 Fix a typo in MailPriorityHandler
in configuration
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 537af6ed3288a41548e6c7ca41969c30420c7214
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue May 19 08:46:45 2020 +0700
JAMES-1541 Fix a typo in MailPriorityHandler in configuration
---
server/app/src/main/resources/smtpserver.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/app/src/main/resources/smtpserver.xml b/server/app/src/main/resources/smtpserver.xml
index 14e16a3..7e6b01f 100644
--- a/server/app/src/main/resources/smtpserver.xml
+++ b/server/app/src/main/resources/smtpserver.xml
@@ -255,7 +255,7 @@
<!-- Normally the MailQueue will just handles Mails in FIFO manner -->
<!-- Valid priority values are 1,5,9 where 9 is the highest-->
<!--
- <handler class="org.apache.james.smtpserver.MailPriortyHandler">
+ <handler class="org.apache.james.smtpserver.MailPriorityHandler">
<priorityEntries>
<priorityEntry>
<domain>yourdomain1</domain>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/06: JAMES-1541 Remove no longer existing
SuppressDuplicateRcptHandler from configuration
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 04e8ec790624066fac48f553a30ad6ae06632cdf
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue May 19 08:45:49 2020 +0700
JAMES-1541 Remove no longer existing SuppressDuplicateRcptHandler from configuration
---
server/app/src/main/resources/smtpserver.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/server/app/src/main/resources/smtpserver.xml b/server/app/src/main/resources/smtpserver.xml
index d0a5637..14e16a3 100644
--- a/server/app/src/main/resources/smtpserver.xml
+++ b/server/app/src/main/resources/smtpserver.xml
@@ -247,12 +247,6 @@
<whitelistedNetworks>127.0.0.0/8</whitelistedNetworks>
</handler>
-->
-
- <!-- This handler ignore duplicated recipients per session. So the email will get only send on time even -->
- <!-- if the recipient is specified more then once -->
- <!--
- <handler class="org.apache.james.smtpserver.protocol.core.fastfail.SuppressDuplicateRcptHandler"/>
- -->
<!-- Load the core command handlers -->
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 06/06: Remove leading line breaks
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ba532d0d5b9fb45344715ed4f5d6125535b41598
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Apr 9 10:00:29 2020 +0700
Remove leading line breaks
---
dockerfiles/run/spring/destination/conf/log4j2.xml | 1 -
server/app/src/main/resources/log4j2.xml | 1 -
2 files changed, 2 deletions(-)
diff --git a/dockerfiles/run/spring/destination/conf/log4j2.xml b/dockerfiles/run/spring/destination/conf/log4j2.xml
index c89ad2e..f8c9fad 100644
--- a/dockerfiles/run/spring/destination/conf/log4j2.xml
+++ b/dockerfiles/run/spring/destination/conf/log4j2.xml
@@ -1,4 +1,3 @@
-
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="INFO" monitorInterval="30">
<Properties>
diff --git a/server/app/src/main/resources/log4j2.xml b/server/app/src/main/resources/log4j2.xml
index c89ad2e..f8c9fad 100644
--- a/server/app/src/main/resources/log4j2.xml
+++ b/server/app/src/main/resources/log4j2.xml
@@ -1,4 +1,3 @@
-
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="INFO" monitorInterval="30">
<Properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 04/06: JAMES-3187 Add webadmin enabled by default
to jpa-guice docker image
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3b4828c069b3d69d97a64961c32e4c357668df13
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon May 18 18:53:11 2020 +0700
JAMES-3187 Add webadmin enabled by default to jpa-guice docker image
---
.../guice/jpa/destination/conf/webadmin.properties | 48 ++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/dockerfiles/run/guice/jpa/destination/conf/webadmin.properties b/dockerfiles/run/guice/jpa/destination/conf/webadmin.properties
new file mode 100644
index 0000000..ec014ea
--- /dev/null
+++ b/dockerfiles/run/guice/jpa/destination/conf/webadmin.properties
@@ -0,0 +1,48 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This template file can be used as example for James Server configuration
+# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
+
+# Read https://james.apache.org/server/config-webadmin.html for further details
+
+enabled=true
+port=8000
+host=localhost
+
+# Defaults to false
+https.enabled=false
+
+# Compulsory when enabling HTTPS
+#https.keystore=/path/to/keystore
+#https.password=password
+
+# Optional when enabling HTTPS (self signed)
+#https.trust.keystore
+#https.trust.password
+
+# Defaults to false
+#jwt.enabled=true
+
+# Defaults to false
+#cors.enable=true
+#cors.origin
+
+# List of fully qualified class names that should be exposed over webadmin
+# in addition to your product default routes. Routes needs to be located
+# within the classpath or in the ./extensions-jars folder.
+#extensions.routes=
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 05/06: JAMES-3187 Provisionned docker: add a cli
helper script
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2207d8b3d833cefee9b63b7ecebe6433e5a41fc5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon May 18 18:18:55 2020 +0700
JAMES-3187 Provisionned docker: add a cli helper script
---
dockerfiles/run/guice/provisioned/Dockerfile | 3 ++-
dockerfiles/run/guice/provisioned/james-cli | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/dockerfiles/run/guice/provisioned/Dockerfile b/dockerfiles/run/guice/provisioned/Dockerfile
index 1acdd8a..a0fdade 100644
--- a/dockerfiles/run/guice/provisioned/Dockerfile
+++ b/dockerfiles/run/guice/provisioned/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM linagora/james-jpa-guice
+FROM linagora/james-jpa-guice:james-project-3.4.0
# Install git
RUN apt-get update
@@ -15,6 +15,7 @@ RUN cp /root/wait-for-it/wait-for-it.sh /usr/bin/wait-for-it.sh
COPY startup.sh /root
COPY initialdata.sh /root
+COPY james-cli /usr/local/bin/
RUN chmod +x /root/startup.sh
RUN chmod +x /root/initialdata.sh
diff --git a/dockerfiles/run/guice/provisioned/james-cli b/dockerfiles/run/guice/provisioned/james-cli
new file mode 100755
index 0000000..752e29c
--- /dev/null
+++ b/dockerfiles/run/guice/provisioned/james-cli
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999 "$@"
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org