You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/04/16 06:20:30 UTC

[james-project] 01/03: JAMES-3261 Copy sample configuration from the docker one

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 5350f1b6f5c62172292f40a50f9b11cb9e92b888
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Jun 21 21:31:44 2020 +0700

    JAMES-3261 Copy sample configuration from the docker one
---
 .../deletedMessageVault.properties                 |  5 +-
 .../sample-configuration/dnsservice.xml            |  1 +
 .../sample-configuration/domainlist.xml            |  2 +
 .../{jmx.properties => elasticsearch.properties}   | 16 +++---
 .../sample-configuration/extensions.properties     | 10 ++++
 .../{jmx.properties => healthcheck.properties}     | 15 +++---
 .../sample-configuration/imapserver.xml            | 14 +++++-
 .../sample-configuration/jmap.properties           |  3 +-
 .../sample-configuration/jmx.properties            |  5 +-
 .../{recipientrewritetable.xml => listeners.xml}   | 16 +++---
 .../sample-configuration/lmtpserver.xml            | 41 ---------------
 .../memory-guice/sample-configuration/logback.xml  | 42 ++++++++++++++++
 .../sample-configuration/mailetcontainer.xml       | 58 ++++++++++++++++++----
 .../sample-configuration/mailrepositorystore.xml   | 12 ++---
 .../sample-configuration/pop3server.xml            |  3 +-
 .../sample-configuration/recipientrewritetable.xml |  3 +-
 .../sample-configuration/smtpserver.xml            | 14 +++---
 .../sample-configuration/usersrepository.xml       |  5 +-
 .../sample-configuration/webadmin.properties       | 28 ++++++++++-
 19 files changed, 197 insertions(+), 96 deletions(-)

diff --git a/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties b/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties
index 8c14c8e..7ac88e8 100644
--- a/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties
+++ b/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties
@@ -1 +1,4 @@
-urlPrefix=cassandra://var/deletedMessages/vault
\ No newline at end of file
+# ============================================= Deleted Messages Vault Configuration ==================================
+# Retention period for your deleted messages into the vault, after which they expire and can be potentially cleaned up
+# Optional, default 1y
+# retentionPeriod=1y
diff --git a/server/container/guice/memory-guice/sample-configuration/dnsservice.xml b/server/container/guice/memory-guice/sample-configuration/dnsservice.xml
index 6e4fbd2..b44a502 100644
--- a/server/container/guice/memory-guice/sample-configuration/dnsservice.xml
+++ b/server/container/guice/memory-guice/sample-configuration/dnsservice.xml
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
+<!-- Read https://james.apache.org/server/config-dnsservice.html for further details -->
 
 <dnsservice>
   <autodiscover>true</autodiscover>
diff --git a/server/container/guice/memory-guice/sample-configuration/domainlist.xml b/server/container/guice/memory-guice/sample-configuration/domainlist.xml
index 10d8981..605439f 100644
--- a/server/container/guice/memory-guice/sample-configuration/domainlist.xml
+++ b/server/container/guice/memory-guice/sample-configuration/domainlist.xml
@@ -18,6 +18,8 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-domainlist.html for further details -->
+
 <domainlist>
     <autodetect>false</autodetect>
     <autodetectIP>false</autodetectIP>
diff --git a/server/container/guice/memory-guice/sample-configuration/jmx.properties b/server/container/guice/memory-guice/sample-configuration/elasticsearch.properties
similarity index 67%
copy from server/container/guice/memory-guice/sample-configuration/jmx.properties
copy to server/container/guice/memory-guice/sample-configuration/elasticsearch.properties
index 1c39a17..6ec2428 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmx.properties
+++ b/server/container/guice/memory-guice/sample-configuration/elasticsearch.properties
@@ -14,16 +14,18 @@
 #  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-elasticsearch.html for further details (metrics only)
 
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
 
-# See http://james.apache.org/server/3/config.html for usage
+# Configuration file for ElasticSearch
 
-jmx.enabled=true
-jmx.address=127.0.0.1
-jmx.port=9999
+# Reports for metrics into ElasticSearch
+# Defaults to elasticsearch.masterHost : on which server to publish metrics
+elasticsearch.http.host=elasticsearch
+elasticsearch.http.port=9200
+elasticsearch.metrics.reports.enabled=true
+elasticsearch.metrics.reports.period=30
+elasticsearch.metrics.reports.index=james-metrics
diff --git a/server/container/guice/memory-guice/sample-configuration/extensions.properties b/server/container/guice/memory-guice/sample-configuration/extensions.properties
new file mode 100644
index 0000000..2a2c23e
--- /dev/null
+++ b/server/container/guice/memory-guice/sample-configuration/extensions.properties
@@ -0,0 +1,10 @@
+# This files enables customization of users extensions injections with guice.
+# A user can drop some jar-with-dependencies within the ./extensions-jars folder and
+# reference classes of these jars in some of James extension mechanisms.
+
+# This includes mailets, matchers, mailboxListeners, preDeletionHooks, protocolHandlers, webAdmin routes
+
+# Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
+
+#List of coma separated (',') fully qualified class names of additional guice modules to be used to instantiate extensions
+#guice.extension.module=
\ No newline at end of file
diff --git a/server/container/guice/memory-guice/sample-configuration/jmx.properties b/server/container/guice/memory-guice/sample-configuration/healthcheck.properties
similarity index 68%
copy from server/container/guice/memory-guice/sample-configuration/jmx.properties
copy to server/container/guice/memory-guice/sample-configuration/healthcheck.properties
index 1c39a17..9f3bad1 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmx.properties
+++ b/server/container/guice/memory-guice/sample-configuration/healthcheck.properties
@@ -14,16 +14,17 @@
 #  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
 
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
+# Configuration file for Periodical Health Checks
+
+# Read https://james.apache.org/server/config-healthcheck.html for further details
 
-# See http://james.apache.org/server/3/config.html for usage
+# Optional. Period between two PeriodicalHealthChecks.
+# Units supported are (ms - millisecond, s - second, m - minute, h - hour, d - day). Default unit is millisecond.
+# Default duration is 60 seconds.
+# Duration must be greater or at least equals to 10 seconds.
+# healthcheck.period=60s
 
-jmx.enabled=true
-jmx.address=127.0.0.1
-jmx.port=9999
diff --git a/server/container/guice/memory-guice/sample-configuration/imapserver.xml b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
index 96387f5..a1306fa 100644
--- a/server/container/guice/memory-guice/sample-configuration/imapserver.xml
+++ b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
@@ -19,11 +19,13 @@ specific language governing permissions and limitations
 under the License.
 -->
 
+<!-- Read https://james.apache.org/server/config-imap4.html for further details -->
+
 
 <imapservers>
     <imapserver enabled="true">
         <jmxName>imapserver</jmxName>
-        <bind>0.0.0.0:1143</bind>
+        <bind>0.0.0.0:143</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="true">
             <!-- To create a new keystore execute:
@@ -35,10 +37,14 @@ under the License.
         </tls>
         <connectionLimit>0</connectionLimit>
         <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
     </imapserver>
     <imapserver enabled="true">
         <jmxName>imapserver-ssl</jmxName>
-        <bind>0.0.0.0:1993</bind>
+        <bind>0.0.0.0:993</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="true" startTLS="false">
             <!-- To create a new keystore execute:
@@ -50,5 +56,9 @@ under the License.
         </tls>
         <connectionLimit>0</connectionLimit>
         <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
     </imapserver>
 </imapservers>
diff --git a/server/container/guice/memory-guice/sample-configuration/jmap.properties b/server/container/guice/memory-guice/sample-configuration/jmap.properties
index 709ed8e..53bc403 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmap.properties
+++ b/server/container/guice/memory-guice/sample-configuration/jmap.properties
@@ -1,4 +1,5 @@
 # Configuration file for JMAP
+# Read https://james.apache.org/server/config-jmap.html for further details
 
 enabled=true
 
@@ -10,4 +11,4 @@ tls.secret=james72laBalle
 # The following entry specify the link to the URL of the public key file,
 # which should be a PEM format file.
 #
-jwt.publickeypem.url=file://conf/jwt_publickey
\ No newline at end of file
+jwt.publickeypem.url=file://conf/jwt_publickey
diff --git a/server/container/guice/memory-guice/sample-configuration/jmx.properties b/server/container/guice/memory-guice/sample-configuration/jmx.properties
index 1c39a17..e56235f 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmx.properties
+++ b/server/container/guice/memory-guice/sample-configuration/jmx.properties
@@ -19,10 +19,7 @@
 #  This template file can be used as example for James Server configuration
 #  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
 
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# See http://james.apache.org/server/3/config.html for usage
+# Read https://james.apache.org/server/config-system.html#jmx.properties for further details
 
 jmx.enabled=true
 jmx.address=127.0.0.1
diff --git a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml b/server/container/guice/memory-guice/sample-configuration/listeners.xml
similarity index 75%
copy from server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
copy to server/container/guice/memory-guice/sample-configuration/listeners.xml
index 5553a40..2eed880 100644
--- a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
+++ b/server/container/guice/memory-guice/sample-configuration/listeners.xml
@@ -18,10 +18,14 @@
   under the License.                                           
  -->
 
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable>
-  <recursiveMapping>true</recursiveMapping>
-  <mappingLimit>10</mappingLimit>
-  <mapping>some@domain=some</mapping>
-</recipientrewritetable>
+<!-- Read https://james.apache.org/server/config-listeners.html for further details -->
 
+<listeners>
+  <listener>
+    <class>org.apache.james.mailbox.spamassassin.SpamAssassinListener</class>
+    <async>true</async>
+  </listener>
+  <preDeletionHook>
+    <class>org.apache.james.vault.DeletedMessageVaultHook</class>
+  </preDeletionHook>
+</listeners>
diff --git a/server/container/guice/memory-guice/sample-configuration/lmtpserver.xml b/server/container/guice/memory-guice/sample-configuration/lmtpserver.xml
deleted file mode 100644
index 87a0caa..0000000
--- a/server/container/guice/memory-guice/sample-configuration/lmtpserver.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  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.                                           
- -->
-
-<lmtpservers>
-
-    <lmtpserver enabled="false">
-        <jmxName>lmtpserver</jmxName>
-        <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
-        <bind>127.0.0.1:1024</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <connectiontimeout>1200</connectiontimeout>
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--  This sets the maximum allowed message size (in kilobytes) for this -->
-        <!--  LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
-        <maxmessagesize>0</maxmessagesize>
-        <handlerchain>
-            <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </lmtpserver>
-
-</lmtpservers>
diff --git a/server/container/guice/memory-guice/sample-configuration/logback.xml b/server/container/guice/memory-guice/sample-configuration/logback.xml
index 677451f..5af37af 100644
--- a/server/container/guice/memory-guice/sample-configuration/logback.xml
+++ b/server/container/guice/memory-guice/sample-configuration/logback.xml
@@ -1,8 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.                                           
+ -->
+
 <configuration>
 
+        <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+                <resetJUL>true</resetJUL>
+        </contextListener>
+
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
                 <encoder>
+                        <pattern>%d{HH:mm:ss.SSS} %highlight([%-5level]) %logger{15} - %msg%n%rEx</pattern>
+                        <immediateFlush>false</immediateFlush>
+                </encoder>
+        </appender>
+
+        <appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+                <file>/logs/james.log</file>
+                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+                    <fileNamePattern>/logs/james.%i.log.tar.gz</fileNamePattern>
+                    <minIndex>1</minIndex>
+                    <maxIndex>3</maxIndex>
+                </rollingPolicy>
+
+                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+                    <maxFileSize>100MB</maxFileSize>
+                </triggeringPolicy>
+
+                <encoder>
                         <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
                         <immediateFlush>false</immediateFlush>
                 </encoder>
@@ -10,6 +51,7 @@
 
         <root level="WARN">
                 <appender-ref ref="CONSOLE" />
+                <appender-ref ref="LOG_FILE" />
         </root>
 
         <logger name="org.apache.james" level="INFO" />
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index 9d81841..918e70c 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -19,6 +19,8 @@
   under the License.
  -->
 
+<!-- Read https://james.apache.org/server/config-mailetcontainer.html for further details -->
+
 <mailetcontainer enableJmx="true">
 
     <context>
@@ -29,6 +31,7 @@
 
     <spooler>
         <threads>20</threads>
+        <errorRepository>memory://var/mail/error/</errorRepository>
     </spooler>
 
     <processors>
@@ -41,9 +44,12 @@
         </processor>
 
         <processor state="error" enableJmx="true">
+            <mailet match="All" class="MetricsMailet">
+                <metricName>mailetContainerErrors</metricName>
+            </mailet>
             <mailet match="All" class="Bounce"/>
             <mailet match="All" class="ToRepository">
-                <repositoryPath>file://var/mail/error/</repositoryPath>
+                <repositoryPath>memory://var/mail/error/</repositoryPath>
             </mailet>
         </processor>
 
@@ -57,14 +63,32 @@
 
             <mailet match="All" class="RemoveMimeHeader">
                 <name>bcc</name>
+                <onMailetException>ignore</onMailetException>
+            </mailet>
+            <mailet match="All" class="RecipientRewriteTable">
+                <errorProcessor>rrt-error</errorProcessor>
             </mailet>
-            <mailet match="All" class="RecipientRewriteTable" />
             <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/>
             <mailet match="RecipientIsLocal" class="Sieve"/>
+            <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
             <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
             <mailet match="RecipientIsLocal" class="LocalDelivery"/>
+            <mailet match="HostIsLocal" class="ToProcessor">
+                <processor>local-address-error</processor>
+                <notice>550 - Requested action not taken: no such user here</notice>
+            </mailet>
+
+            <mailet match="relay-allowed" class="ToProcessor">
+                <processor>relay</processor>
+            </mailet>
 
-            <mailet match="relay-allowed" class="RemoteDelivery">
+            <mailet match="All" class="ToProcessor">
+                <processor>relay-denied</processor>
+            </mailet>
+        </processor>
+
+        <processor state="relay" enableJmx="true">
+            <mailet match="All" class="RemoteDelivery">
                 <outgoingQueue>outgoing</outgoingQueue>
                 <delayTime>5000, 100000, 500000</delayTime>
                 <maxRetries>3</maxRetries>
@@ -73,35 +97,51 @@
                 <sendpartial>true</sendpartial>
                 <bounceProcessor>bounces</bounceProcessor>
             </mailet>
-            <mailet match="All" class="ToProcessor">
-                <processor>relay-denied</processor>
-            </mailet>
         </processor>
 
         <processor state="local-address-error" enableJmx="true">
+            <mailet match="All" class="MetricsMailet">
+                <metricName>mailetContainerLocalAddressError</metricName>
+            </mailet>
             <mailet match="All" class="Bounce">
                 <attachment>none</attachment>
             </mailet>
             <mailet match="All" class="ToRepository">
-                <repositoryPath>file://var/mail/address-error/</repositoryPath>
+                <repositoryPath>memory://var/mail/address-error/</repositoryPath>
             </mailet>
         </processor>
 
         <processor state="relay-denied" enableJmx="true">
+            <mailet match="All" class="MetricsMailet">
+                <metricName>mailetContainerRelayDenied</metricName>
+            </mailet>
             <mailet match="All" class="Bounce">
                 <attachment>none</attachment>
             </mailet>
             <mailet match="All" class="ToRepository">
-                <repositoryPath>file://var/mail/relay-denied/</repositoryPath>
-                <notice>Warning: You are sending an e-mail to a remote server. You must be authentified to perform such an operation</notice>
+                <repositoryPath>memory://var/mail/relay-denied/</repositoryPath>
+                <notice>Warning: You are sending an e-mail to a remote server. You must be authenticated to perform such an operation</notice>
             </mailet>
         </processor>
 
         <processor state="bounces" enableJmx="true">
+            <mailet match="All" class="MetricsMailet">
+                <metricName>bounces</metricName>
+            </mailet>
             <mailet match="All" class="DSNBounce">
                 <passThrough>false</passThrough>
             </mailet>
         </processor>
+
+        <processor state="rrt-error" enableJmx="false">
+            <mailet match="All" class="ToRepository">
+                <repositoryPath>memory://var/mail/rrt-error/</repositoryPath>
+                <passThrough>true</passThrough>
+            </mailet>
+            <mailet match="IsSenderInRRTLoop" class="Null"/>
+            <mailet match="All" class="Bounce"/>
+        </processor>
+
     </processors>
 
 </mailetcontainer>
diff --git a/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml b/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml
index 099710e..c7f22b9 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml
@@ -19,17 +19,15 @@
   under the License.
  -->
 
+<!-- Read https://james.apache.org/server/config-mailrepositorystore.html for further details -->
+
 <mailrepositorystore>
-    <defaultProtocol>file</defaultProtocol>
+    <defaultProtocol>memory</defaultProtocol>
     <mailrepositories>
-        <!-- File based repositories.  These repositories store all message data -->
-        <!-- in the file system. -->
-        <mailrepository class="org.apache.james.mailrepository.file.FileMailRepository">
+        <mailrepository class="org.apache.james.mailrepository.memory.MemoryMailRepository">
             <protocols>
-                <protocol>file</protocol>
+                <protocol>memory</protocol>
             </protocols>
-            <!-- Set if the messages should be listed sorted. False by default -->
-            <config FIFO="false" CACHEKEYS="true"/>
         </mailrepository>
     </mailrepositories>
 </mailrepositorystore>
diff --git a/server/container/guice/memory-guice/sample-configuration/pop3server.xml b/server/container/guice/memory-guice/sample-configuration/pop3server.xml
index c57c832..10a2e08 100644
--- a/server/container/guice/memory-guice/sample-configuration/pop3server.xml
+++ b/server/container/guice/memory-guice/sample-configuration/pop3server.xml
@@ -18,11 +18,12 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-pop3.html for further details -->
 
 <pop3servers>
     <pop3server enabled="false">
         <jmxName>pop3server</jmxName>
-        <bind>0.0.0.0:1110</bind>
+        <bind>0.0.0.0:110</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="false">
             <!-- To create a new keystore execute:
diff --git a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
index 5553a40..1a512c6 100644
--- a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
+++ b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
@@ -18,10 +18,11 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-recipientrewritetable.html for further details -->
+
 <!-- The default table for storing James' RecipientRewriteTable mappings. -->
 <recipientrewritetable>
   <recursiveMapping>true</recursiveMapping>
   <mappingLimit>10</mappingLimit>
-  <mapping>some@domain=some</mapping>
 </recipientrewritetable>
 
diff --git a/server/container/guice/memory-guice/sample-configuration/smtpserver.xml b/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
index 814575a..722b0c2 100644
--- a/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
+++ b/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
@@ -19,10 +19,12 @@
   under the License.
  -->
 
+<!-- Read https://james.apache.org/server/config-smtp-lmtp.html#SMTP_Configuration for further details -->
+
 <smtpservers>
     <smtpserver enabled="true">
         <jmxName>smtpserver-global</jmxName>
-        <bind>0.0.0.0:1025</bind>
+        <bind>0.0.0.0:25</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="false">
             <keystore>file://conf/keystore</keystore>
@@ -34,7 +36,7 @@
         <connectionLimit>0</connectionLimit>
         <connectionLimitPerIP>0</connectionLimitPerIP>
         <authRequired>false</authRequired>
-        <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
         <verifyIdentity>true</verifyIdentity>
         <maxmessagesize>0</maxmessagesize>
         <addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -46,7 +48,7 @@
     </smtpserver>
     <smtpserver enabled="true">
         <jmxName>smtpserver-TLS</jmxName>
-        <bind>0.0.0.0:1465</bind>
+        <bind>0.0.0.0:465</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="true" startTLS="false">
             <keystore>file://conf/keystore</keystore>
@@ -61,7 +63,7 @@
            Authorize only local users
         -->
         <authRequired>true</authRequired>
-        <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
         <!-- Trust authenticated users -->
         <verifyIdentity>false</verifyIdentity>
         <maxmessagesize>0</maxmessagesize>
@@ -74,7 +76,7 @@
     </smtpserver>
     <smtpserver enabled="true">
         <jmxName>smtpserver-authenticated</jmxName>
-        <bind>0.0.0.0:1587</bind>
+        <bind>0.0.0.0:587</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="true">
             <keystore>file://conf/keystore</keystore>
@@ -89,7 +91,7 @@
            Authorize only local users
         -->
         <authRequired>true</authRequired>
-        <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
         <!-- Trust authenticated users -->
         <verifyIdentity>false</verifyIdentity>
         <maxmessagesize>0</maxmessagesize>
diff --git a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
index cc55c5e..8b3e8e1 100644
--- a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
+++ b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
@@ -18,10 +18,11 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-users.html for further details -->
+
 <usersrepository name="LocalUsers">
-    <destination URL="file://users/"/>
     <algorithm>MD5</algorithm>
-    <enableVirtualHosting>true</enableVirtualHosting>
+    <enableVirtualHosting>true</enableVirtualHosting>    
     <enableForwarding>true</enableForwarding>
 </usersrepository>
 
diff --git a/server/container/guice/memory-guice/sample-configuration/webadmin.properties b/server/container/guice/memory-guice/sample-configuration/webadmin.properties
index a9b5cc2..52cfffd 100644
--- a/server/container/guice/memory-guice/sample-configuration/webadmin.properties
+++ b/server/container/guice/memory-guice/sample-configuration/webadmin.properties
@@ -18,6 +18,32 @@
 #  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
\ No newline at end of file
+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: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org