Author: eric Date: Tue Mar 20 16:03:09 2012 New Revision: 1302961 URL: http://svn.apache.org/viewvc?rev=1302961&view=rev Log: More formatting for the *-template.conf file
Modified: james/app/trunk/src/main/resources/dnsservice-template.conf james/app/trunk/src/main/resources/domainlist-template.conf james/app/trunk/src/main/resources/fetchmail-template.conf james/app/trunk/src/main/resources/imapserver-template.conf james/app/trunk/src/main/resources/lmtpserver-template.conf james/app/trunk/src/main/resources/mailbox-template.conf james/app/trunk/src/main/resources/mailetcontainer-template.conf james/app/trunk/src/main/resources/mailrepositorystore-template.conf james/app/trunk/src/main/resources/pop3server-template.conf james/app/trunk/src/main/resources/recipientrewritetable-template.conf james/app/trunk/src/main/resources/smtpserver-template.conf james/app/trunk/src/main/resources/usersrepository-template.conf james/app/trunk/src/main/resources/usersrepository23-template.conf Modified: james/app/trunk/src/main/resources/dnsservice-template.conf URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/dnsservice-template.conf?rev=1302961&r1=1302960&r2=1302961&view=diff ============================================================================== --- james/app/trunk/src/main/resources/dnsservice-template.conf (original) +++ james/app/trunk/src/main/resources/dnsservice-template.conf Tue Mar 20 16:03:09 2012 @@ -34,24 +34,24 @@ <!-- servers element. Each server element is the IP address of a single DNS server. --> <!-- The servers element can have multiple server children. --> <dnsservice> - <servers> - <!--Enter ip address of your DNS server, one IP address per server --> - <!-- element. --> - <!-- - <server>127.0.0.1</server> + <servers> + <!--Enter ip address of your DNS server, one IP address per server --> + <!-- element. --> + <!-- + <server>127.0.0.1</server> --> - </servers> - <!-- Change autodiscover to false if you would like to turn off autodiscovery --> - <!-- and set the DNS servers manually in the <servers> section --> - <autodiscover>true</autodiscover> - <authoritative>false</authoritative> + </servers> + <!-- Change autodiscover to false if you would like to turn off autodiscovery --> + <!-- and set the DNS servers manually in the<servers>section --> + <autodiscover>true</autodiscover> + <authoritative>false</authoritative> - <!-- Maximum number of entries to maintain in the DNS cache --> - <maxcachesize>50000</maxcachesize> + <!-- Maximum number of entries to maintain in the DNS cache --> + <maxcachesize>50000</maxcachesize> - <!-- Uncomment this if you want James to try a single server for each --> - <!-- multihomed mx host. --> - <!-- - <singleIPperMX> true </singleIPperMX> + <!-- Uncomment this if you want James to try a single server for each --> + <!-- multihomed mx host. --> + <!-- + <singleIPperMX>true</singleIPperMX> --> </dnsservice> Modified: james/app/trunk/src/main/resources/domainlist-template.conf URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/domainlist-template.conf?rev=1302961&r1=1302960&r2=1302961&view=diff ============================================================================== --- james/app/trunk/src/main/resources/domainlist-template.conf (original) +++ james/app/trunk/src/main/resources/domainlist-template.conf Tue Mar 20 16:03:09 2012 @@ -18,7 +18,6 @@ under the License. --> - <!-- Domainnames identifies the DNS namespace served by this instance of James. --> <!-- These domainnames are used for both matcher/mailet processing and SMTP auth --> <!-- to determine when a mail is intended for local delivery. --> @@ -35,24 +34,23 @@ <!-- By default, the domainname 'localhost' is specified. This can be removed, if required. --> <!-- --> <!-- Warning: If you are using fetchmail it is important to include the --> -<!-- fetched domains in the server name list to prevent looping. --> +<!-- fetched domains in the server name list to prevent looping. --> -<!-- XML based DomainList implementation --> -<domainlist class="org.apache.james.domainlist.xml.XMLDomainList"> - <domainnames> - <domainname>localhost</domainname> - </domainnames> - <autodetect>true</autodetect> - <autodetectIP>true</autodetectIP> - <defaultDomain>localhost</defaultDomain> -</domainlist> - <!-- JPA implementation for DomainList --> -<!-- <domainlist class="org.apache.james.domainlist.jpa.JPADomainList"> - <autodetect>true</autodetect> - <autodetectIP>true</autodetectIP> - <defaultDomain>localhost</defaultDomain> + <autodetect>true</autodetect> + <autodetectIP>true</autodetectIP> + <defaultDomain>localhost</defaultDomain> </domainlist> ---> +<!-- XML based implementation for DomainList --> +<!-- +<domainlist class="org.apache.james.domainlist.xml.XMLDomainList"> + <domainnames> + <domainname>localhost</domainname> + </domainnames> + <autodetect>true</autodetect> + <autodetectIP>true</autodetectIP> + <defaultDomain>localhost</defaultDomain> +</domainlist> +--> Modified: james/app/trunk/src/main/resources/fetchmail-template.conf URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/fetchmail-template.conf?rev=1302961&r1=1302960&r2=1302961&view=diff ============================================================================== --- james/app/trunk/src/main/resources/fetchmail-template.conf (original) +++ james/app/trunk/src/main/resources/fetchmail-template.conf Tue Mar 20 16:03:09 2012 @@ -20,11 +20,11 @@ <!-- Fetch mail block, fetches mail from message servers and inserts it into the incoming spool --> <!-- Warning: It is important to prevent mail from looping by setting the --> -<!-- fetched domains in the <servernames> section of the <James> block --> +<!-- fetched domains in the<servernames>section of the<James>block --> <!-- above. This block is disabled by default. --> <!-- See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for detailed --> -<!-- configuration instructions and examples. --> +<!-- configuration instructions and examples. --> <!-- I M P O R T A N T --> <!-- Setting markseen="true" will have no effect on many POP3 servers as the POP3 --> @@ -38,242 +38,244 @@ <!-- fetch task's name parameter described below. --> <fetchmail enabled="false"> - <!-- The number of threads to use for the scheduled execution --> - <threads>5</threads> - - <!-- The JMX Name to use --> - <jmxName>fetchmail</jmxName> + + <!-- The number of threads to use for the scheduled execution --> + <threads>5</threads> + <!-- The JMX Name to use --> + <jmxName>fetchmail</jmxName> - <!-- You can have as many fetch tasks as you want, but each must have a --> - <!-- unique name by which it is identified. --> - <!-- Each task runs at the specified <interval>, tasks may run concurrently. --> - <fetch name="mydomain.com"> - <!-- There must be one <accounts> entry per fetch task. An accounts entry can have 0 to many --> - <!-- <account> entries and 0 or 1 <alllocal> entries. <alllocal> generates --> - <!-- <accounts> for every user defined to James. <accounts> run consecutively within the --> - <!-- scope of their fetch task and inherit all the properties of the fetch task. --> - - <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks --> - <!-- operating concurrently on the same mailboxes. --> - - <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is --> - <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, --> - <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. --> - - <!-- When a message server delivers mail for a single user to a specific INBOX you can define --> - <!-- each user to James (via the console) and use <alllocal> with ignorercpt-header="true" to deliver mail --> - <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' --> - <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. --> - - <!-- When a message server provides an account that gives access to all mail for a domain through a single --> - <!-- INBOX, you can use an <account> to fetch all the mail for that domain, using the filter facilities --> - <!-- described below to reject unwanted messages. --> - - <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail --> - <!-- for a domain through a single INBOX, you can use <alllocal> and <account> together to guarantee that all --> - <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message --> - <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. --> - - <!-- Limitations and Future Directions --> - <!-- 1) <alllocal> requires the password for all accounts for a domain on the message server be the same. True --> - <!-- in many cases, but not all. A future version might work out a way of associating James users with a set --> - <!-- of account properties. --> - <!-- 2) <alllocal> will try to access an INBOX on the message server for all local users. The instance of James used --> - <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. --> - <!-- Again, a future version might work out a way of associating James users with message account properties. --> - <!-- This would allow all local users with an account on a particular message server to be fetched. --> - - <accounts> - <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/> - <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/> - <!-- Custom recipient header handling --> - <!-- this example search an header named X-Envelope-To and use the recipient found in that header --> - <!-- - <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/> + <!-- You can have as many fetch tasks as you want, but each must have a --> + <!-- unique name by which it is identified. --> + <!-- Each task runs at the specified<interval>, tasks may run concurrently. --> + + <fetch name="mydomain.com"> + <!-- There must be one<accounts>entry per fetch task. An accounts entry can have 0 to many --> + <!--<account>entries and 0 or 1<alllocal>entries.<alllocal>generates --> + <!--<accounts>for every user defined to James.<accounts>run consecutively within the --> + <!-- scope of their fetch task and inherit all the properties of the fetch task. --> + + <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks --> + <!-- operating concurrently on the same mailboxes. --> + + <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is --> + <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, --> + <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. --> + + <!-- When a message server delivers mail for a single user to a specific INBOX you can define --> + <!-- each user to James (via the console) and use<alllocal>with ignorercpt-header="true" to deliver mail --> + <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' --> + <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. --> + + <!-- When a message server provides an account that gives access to all mail for a domain through a single --> + <!-- INBOX, you can use an<account>to fetch all the mail for that domain, using the filter facilities --> + <!-- described below to reject unwanted messages. --> + + <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail --> + <!-- for a domain through a single INBOX, you can use<alllocal>and<account>together to guarantee that all --> + <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message --> + <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. --> + + <!-- Limitations and Future Directions --> + <!-- 1)<alllocal>requires the password for all accounts for a domain on the message server be the same. True --> + <!-- in many cases, but not all. A future version might work out a way of associating James users with a set --> + <!-- of account properties. --> + <!-- 2)<alllocal>will try to access an INBOX on the message server for all local users. The instance of James used --> + <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. --> + <!-- Again, a future version might work out a way of associating James users with message account properties. --> + <!-- This would allow all local users with an account on a particular message server to be fetched. --> + + <accounts> + <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/> + <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/> + <!-- Custom recipient header handling --> + <!-- this example search an header named X-Envelope-To and use the recipient found in that header --> + <!-- + <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/> --> - </accounts> + </accounts> - <!-- The address of the server from which to fetch the mail --> - <host>pop.server.com</host> + <!-- The address of the server from which to fetch the mail --> + <host>pop.server.com</host> - <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes --> - <interval>600000</interval> + <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes --> + <interval>600000</interval> - <!-- name of the javamail provider you wish to use --> - <!-- (pop3, imap, etc. --> - <javaMailProviderName>pop3</javaMailProviderName> - - <!-- name of the folder to open --> - <javaMailFolderName>INBOX</javaMailFolderName> - - <!-- Properties to be applied to the JavaMail Session. --> - <!-- Properties are specific to the selected JavaMail provider. --> - <!-- Any number may be specified. --> - <javaMailProperties> - <!-- Set the connection timeout to 3 minutes --> - <property name="mail.pop3.connectiontimeout" value="180000"/> - <!-- Set the I/O timeout to 3 minutes --> - <property name="mail.pop3.timeout" value="180000"/> - </javaMailProperties> - - <!-- Retrieve both old (seen) and new messages from mailserver. The default --> - <!-- is to fetch only messages the server has not marked as seen --> - <fetchall>false</fetchall> - - <!-- If the folder javaMailFolderName contains subfolders do you --> - <!-- want to recurse into the subfolders as well? true = yes, false = no --> - <recursesubfolders>false</recursesubfolders> - - <!-- If the From: header of a fetched message has a valid user part --> - <!-- but no domain part the fetch task will correct this by appending --> - <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' --> - <!-- The default behaviour is to append the canonical host name of the James server. --> - <!-- You can override this behaviour here by specifying the name of the domain --> - <!-- you wish to append. The name you choose must be a local server or you can --> - <!-- use the name localhost --> - <!-- Example using a locally served domain --> - <!-- - <defaultdomain>mydomain.com</defaultdomain> + <!-- name of the javamail provider you wish to use --> + <!-- (pop3, imap, etc. --> + <javaMailProviderName>pop3</javaMailProviderName> + + <!-- name of the folder to open --> + <javaMailFolderName>INBOX</javaMailFolderName> + + <!-- Properties to be applied to the JavaMail Session. --> + <!-- Properties are specific to the selected JavaMail provider. --> + <!-- Any number may be specified. --> + <javaMailProperties> + <!-- Set the connection timeout to 3 minutes --> + <property name="mail.pop3.connectiontimeout" value="180000"/> + <!-- Set the I/O timeout to 3 minutes --> + <property name="mail.pop3.timeout" value="180000"/> + </javaMailProperties> + + <!-- Retrieve both old (seen) and new messages from mailserver. The default --> + <!-- is to fetch only messages the server has not marked as seen --> + <fetchall>false</fetchall> + + <!-- If the folder javaMailFolderName contains subfolders do you --> + <!-- want to recurse into the subfolders as well? true = yes, false = no --> + <recursesubfolders>false</recursesubfolders> + + <!-- If the From: header of a fetched message has a valid user part --> + <!-- but no domain part the fetch task will correct this by appending --> + <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' --> + <!-- The default behaviour is to append the canonical host name of the James server. --> + <!-- You can override this behaviour here by specifying the name of the domain --> + <!-- you wish to append. The name you choose must be a local server or you can --> + <!-- use the name localhost --> + <!-- Example using a locally served domain --> + <!-- + <defaultdomain>mydomain.com</defaultdomain> --> - <!-- Example using localhost --> - <!-- - <defaultdomain>localhost</defaultdomain> + <!-- Example using localhost --> + <!-- + <defaultdomain>localhost</defaultdomain> --> - <!-- Specify what happens to messages succesfully fetched from the mailserver --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <fetched leaveonserver="false" markseen="true"/> - - <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name --> - <!-- and what happens to messages that contain an invalid header at that index. --> - <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate --> - <!-- remote MTAs. --> - <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain --> - <!-- will be set to 'localhost'. Both are almost always considered legitimate. --> - <!-- index --> - <!-- The zero based index of the RECEIVED Header used to compute the remote address and remote host name --> - <!-- of the MTA that delivered a fetched message. --> - <!-- Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store --> - <!-- and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second --> - <!-- RECEIVED Header is the one to use. --> - <!-- Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. --> - <!-- An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. --> - <!-- reject --> - <!-- if true, messages whose received header at the specified index is invalid will be rejected --> - <!-- if false, messages whose received header at the specified index is invalid will be accepted --> - <!-- and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" --> - <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> - <!-- The following apply if reject="true" and a message is rejected... --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/> + <!-- Specify what happens to messages succesfully fetched from the mailserver --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <fetched leaveonserver="false" markseen="true"/> + + <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name --> + <!-- and what happens to messages that contain an invalid header at that index. --> + <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate --> + <!-- remote MTAs. --> + <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain --> + <!-- will be set to 'localhost'. Both are almost always considered legitimate. --> + <!-- index --> + <!-- The zero based index of the RECEIVED Header used to compute the remote address and remote host name --> + <!-- of the MTA that delivered a fetched message. --> + <!-- Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store --> + <!-- and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second --> + <!-- RECEIVED Header is the one to use. --> + <!-- Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. --> + <!-- An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. --> + <!-- reject --> + <!-- if true, messages whose received header at the specified index is invalid will be rejected --> + <!-- if false, messages whose received header at the specified index is invalid will be accepted --> + <!-- and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" --> + <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> + <!-- The following apply if reject="true" and a message is rejected... --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/> - <!-- Specify what happens to messages whose size exceeds the specified limit. --> - <!-- This tag is optional. If omitted, there is no limit. --> - <!-- limit --> - <!-- The maximum message size in Kilobytes of messages injected into James. --> - <!-- A value of 0 means no limit. --> - <!-- reject --> - <!-- if true, messages whose size exceeds the limit will be rejected --> - <!-- if false, messages whose size exceeds the limit will be stripped of their message bodies --> - <!-- prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" --> - <!-- will be added to the message with the value set to the original message size in bytes. --> - <!-- Use the HasMailAttribute matcher to detect them. --> - <!-- The following apply if reject="true" and a message is rejected... --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/> - - <!-- Specify what happens to undeliverable messages --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <undeliverable leaveonserver="true" markseen="false"/> - - <!-- Specify what happens to messages for which a recipient cannot be determined. --> - <!-- defer --> - <!-- if true, processing of messages for which a recipient cannot be determined will deferred --> - <!-- until the next fetch of the Account. This gives an opportunity for other Accounts in the --> - <!-- fetch task to determine the recipient and process the mail. --> - <!-- if false, messages for which a recipient cannot be determined are processed immediately. --> - <!-- reject --> - <!-- if true, messages for which a recipient cannot be determined will be rejected --> - <!-- if false, messages for which a recipient cannot be determined will be accepted, --> - <!-- the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" --> - <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> - <!-- The following apply if reject="true" and a message is rejected... --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/> - - <!-- Specify a list of recipients for whom messages will be rejected --> - <!-- and what happens to rejected messages. --> - <!-- The list can be comma, tab or space delimited. --> - <!-- reject --> - <!-- if true, messages for users on the blacklist will be rejected --> - <!-- if false, messages for users on the blacklist will be accepted --> - <!-- and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" --> - <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> - <!-- The following apply if reject="true" and a message is rejected... --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <blacklist reject="true" leaveonserver="true" markseen="false"> wibble@localhost, flobble@localhost </blacklist> - - <!-- Specify if messages for users who are not defined to James should --> - <!-- be rejected and what happens to rejected messages. --> - <!-- reject --> - <!-- if true, messages for users who are not defined to James will be rejected --> - <!-- if false, messages for users who are not defined to James will be accepted --> - <!-- and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" --> - <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> - <!-- The following apply if reject="true" and a message is rejected... --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <userundefined reject="true" leaveonserver="true" markseen="false" /> - - <!-- Specify if messages for recipients on remote hosts should --> - <!-- be rejected and what happens to rejected messages. --> - <!-- reject --> - <!-- if true, messages for remote recipients will be rejected --> - <!-- if false, messages for remote recipients will be accepted --> - <!-- and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" --> - <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> - <!-- The following apply if reject="true" and a message is rejected... --> - <!-- leaveonserver --> - <!-- if true, messages will be left on the server --> - <!-- if false, messages will be deleted from the server --> - <!-- markseen --> - <!-- if true, messages left on the server will be marked as seen --> - <!-- if false, messages left on the server will not be marked as seen --> - <remoterecipient reject="true" leaveonserver="true" markseen="false" /> - </fetch> -</fetchmail> + <!-- Specify what happens to messages whose size exceeds the specified limit. --> + <!-- This tag is optional. If omitted, there is no limit. --> + <!-- limit --> + <!-- The maximum message size in Kilobytes of messages injected into James. --> + <!-- A value of 0 means no limit. --> + <!-- reject --> + <!-- if true, messages whose size exceeds the limit will be rejected --> + <!-- if false, messages whose size exceeds the limit will be stripped of their message bodies --> + <!-- prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" --> + <!-- will be added to the message with the value set to the original message size in bytes. --> + <!-- Use the HasMailAttribute matcher to detect them. --> + <!-- The following apply if reject="true" and a message is rejected... --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/> + + <!-- Specify what happens to undeliverable messages --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <undeliverable leaveonserver="true" markseen="false"/> + + <!-- Specify what happens to messages for which a recipient cannot be determined. --> + <!-- defer --> + <!-- if true, processing of messages for which a recipient cannot be determined will deferred --> + <!-- until the next fetch of the Account. This gives an opportunity for other Accounts in the --> + <!-- fetch task to determine the recipient and process the mail. --> + <!-- if false, messages for which a recipient cannot be determined are processed immediately. --> + <!-- reject --> + <!-- if true, messages for which a recipient cannot be determined will be rejected --> + <!-- if false, messages for which a recipient cannot be determined will be accepted, --> + <!-- the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" --> + <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> + <!-- The following apply if reject="true" and a message is rejected... --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/> + + <!-- Specify a list of recipients for whom messages will be rejected --> + <!-- and what happens to rejected messages. --> + <!-- The list can be comma, tab or space delimited. --> + <!-- reject --> + <!-- if true, messages for users on the blacklist will be rejected --> + <!-- if false, messages for users on the blacklist will be accepted --> + <!-- and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" --> + <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> + <!-- The following apply if reject="true" and a message is rejected... --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <blacklist reject="true" leaveonserver="true" markseen="false">wibble@localhost, flobble@localhost</blacklist> + + <!-- Specify if messages for users who are not defined to James should --> + <!-- be rejected and what happens to rejected messages. --> + <!-- reject --> + <!-- if true, messages for users who are not defined to James will be rejected --> + <!-- if false, messages for users who are not defined to James will be accepted --> + <!-- and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" --> + <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> + <!-- The following apply if reject="true" and a message is rejected... --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <userundefined reject="true" leaveonserver="true" markseen="false" /> + + <!-- Specify if messages for recipients on remote hosts should --> + <!-- be rejected and what happens to rejected messages. --> + <!-- reject --> + <!-- if true, messages for remote recipients will be rejected --> + <!-- if false, messages for remote recipients will be accepted --> + <!-- and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" --> + <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. --> + <!-- The following apply if reject="true" and a message is rejected... --> + <!-- leaveonserver --> + <!-- if true, messages will be left on the server --> + <!-- if false, messages will be deleted from the server --> + <!-- markseen --> + <!-- if true, messages left on the server will be marked as seen --> + <!-- if false, messages left on the server will not be marked as seen --> + <remoterecipient reject="true" leaveonserver="true" markseen="false" /> + </fetch> + +</fetchmail> Modified: james/app/trunk/src/main/resources/imapserver-template.conf URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/imapserver-template.conf?rev=1302961&r1=1302960&r2=1302961&view=diff ============================================================================== --- james/app/trunk/src/main/resources/imapserver-template.conf (original) +++ james/app/trunk/src/main/resources/imapserver-template.conf Tue Mar 20 16:03:09 2012 @@ -24,48 +24,48 @@ <!-- but does not free as many resources as removing them would --> <imapserver enabled="true"> - <jmxName>imapserver</jmxName> + <jmxName>imapserver</jmxName> - <!-- Configure this if you want to bind to a specific inetaddress --> - <!-- port 143 is the well-known/IANA registered port for IMAP --> - <!-- port 993 is the well-known/IANA registered port for IMAPS ie over SSL/TLS --> - <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork --> - <!-- in order to avoid relay check for locally generated bounces --> - <bind>0.0.0.0:143</bind> + <!-- Configure this if you want to bind to a specific inetaddress --> + <!-- port 143 is the well-known/IANA registered port for IMAP --> + <!-- port 993 is the well-known/IANA registered port for IMAPS ie over SSL/TLS --> + <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork --> + <!-- in order to avoid relay check for locally generated bounces --> + <bind>0.0.0.0:143</bind> - <connectionBacklog>200</connectionBacklog> + <connectionBacklog>200</connectionBacklog> - <!-- Set to true to use TLS for the Socket. + <!-- Set to true to use TLS for the Socket. To use this you need to copy sunjce_provider.jar to /path/james/lib directory. --> - <tls socketTLS="false" startTLS="false"> - <!-- To create a new keystore execute: + <tls socketTLS="false" startTLS="false"> + <!-- To create a new keystore execute: keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore --> - <keystore>file://conf/keystore</keystore> - <secret>yoursecret</secret> - <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> - </tls> + <keystore>file://conf/keystore</keystore> + <secret>yoursecret</secret> + <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> + </tls> - <handler> - <!-- This is the name used by the server to identify itself in the SMTP --> - <!-- protocol. If autodetect is TRUE, the server will discover its --> - <!-- own host name and use that in the protocol. If discovery fails, --> - <!-- the value of 'localhost' is used. If autodetect is FALSE, James --> - <!-- will use the specified value. --> - <!-- - <helloName autodetect="true">myMailServer</helloName> + <handler> + <!-- This is the name used by the server to identify itself in the SMTP --> + <!-- protocol. If autodetect is TRUE, the server will discover its --> + <!-- own host name and use that in the protocol. If discovery fails, --> + <!-- the value of 'localhost' is used. If autodetect is FALSE, James --> + <!-- will use the specified value. --> + <!-- + <helloName autodetect="true">myMailServer</helloName> --> - <!-- Connection timeout is 30 minutes and can not be changed - See rfc2060 5.4 for details --> + <!-- Connection timeout is 30 minutes and can not be changed - See rfc2060 5.4 for details --> - <!-- Set the maximum simultaneous incoming connections for this service --> - <connectionLimit> 0 </connectionLimit> + <!-- 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> + <!-- Set the maximum simultaneous incoming connections per IP for this service --> + <connectionLimitPerIP>0</connectionLimitPerIP> - </handler> + </handler> </imapserver> Modified: james/app/trunk/src/main/resources/lmtpserver-template.conf URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/lmtpserver-template.conf?rev=1302961&r1=1302960&r2=1302961&view=diff ============================================================================== --- james/app/trunk/src/main/resources/lmtpserver-template.conf (original) +++ james/app/trunk/src/main/resources/lmtpserver-template.conf Tue Mar 20 16:03:09 2012 @@ -25,48 +25,46 @@ <!-- but does not free as many resources as removing them would --> <lmtpserver enabled="false"> - <jmxName>lmtpserver</jmxName> + <jmxName>lmtpserver</jmxName> - <!-- LMTP should not be reachable from outside your network so bind it to loopback--> - <bind>127.0.0.1:24</bind> + <!-- LMTP should not be reachable from outside your network so bind it to loopback--> + <bind>127.0.0.1:24</bind> - <connectionBacklog>200</connectionBacklog> + <connectionBacklog>200</connectionBacklog> - <handler> - <!-- This is the name used by the server to identify itself in the LMTP --> - <!-- protocol. If autodetect is TRUE, the server will discover its --> - <!-- own host name and use that in the protocol. If discovery fails, --> - <!-- the value of 'localhost' is used. If autodetect is FALSE, James --> - <!-- will use the specified value. --> - <!-- - <helloName autodetect="true">myMailServer</helloName> - --> - <!-- connection timeout in secconds --> - <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> - - - <!-- This sets the LMTPGreeting which will be used when connect to the lmtpserver --> - <!-- If none is specified a default is generated --> - <!-- - <smtpGreeting> JAMES LMTP Server </smtpGreeting> - --> - - <handlerchain> - <!-- This loads the core CommandHandlers. Only remove this if you really --> - <!-- know what you are doing --> - <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/> - </handlerchain> - </handler> + <!-- This is the name used by the server to identify itself in the LMTP --> + <!-- protocol. If autodetect is TRUE, the server will discover its --> + <!-- own host name and use that in the protocol. If discovery fails, --> + <!-- the value of 'localhost' is used. If autodetect is FALSE, James --> + <!-- will use the specified value. --> + <!-- + <helloName autodetect="true">myMailServer</helloName> + --> + <!-- connection timeout in secconds --> + <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> + + <!-- This sets the LMTPGreeting which will be used when connect to the lmtpserver --> + <!-- If none is specified a default is generated --> + <!-- + <smtpGreeting>JAMES LMTP Server</smtpGreeting> + --> + + <handlerchain> + <!-- This loads the core CommandHandlers. Only remove this if you really --> + <!-- know what you are doing --> + <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/> + </handlerchain> + </lmtpserver> </lmtpservers> Modified: james/app/trunk/src/main/resources/mailbox-template.conf URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/mailbox-template.conf?rev=1302961&r1=1302960&r2=1302961&view=diff ============================================================================== --- james/app/trunk/src/main/resources/mailbox-template.conf (original) +++ james/app/trunk/src/main/resources/mailbox-template.conf Tue Mar 20 16:03:09 2012 @@ -21,9 +21,9 @@ <!-- See http://james.apache.org/server/3/config.html for usage --> <mailbox> - <!-- supported providers are: --> - <!-- jpa, jcr, maildir, hbase, memory --> - <!-- --> - <!-- Be aware that maildir will only work on unix like operation systems! --> - <provider>jpa</provider> -</mailbox> \ No newline at end of file + <!-- supported providers are: --> + <!-- jpa, jcr, maildir, hbase, memory --> + <!-- --> + <!-- Be aware that maildir will only work on unix like operation systems! --> + <provider>jpa</provider> +</mailbox> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org