diff --git a/src/site/site.xml b/src/site/site.xml
index b7835e9b..30c5d393 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -41,6 +41,7 @@
In addition to basic settings described in
+ Getting started
+ DavMail also supports the following settings:
+
+
+
+
+ | Parameter |
+ Description |
+ Sample value |
+
+
+ | Enable EWS |
+ Enable EWS mode on Exchange 2010 or Exchange 2007 with Webdav disabled |
+ false |
+
+
+ | Default domain |
+ Default windows domain name |
+ DOMAIN |
+
+
+ | Display startup banner |
+ Whether to show the initial startup notification window or not |
+ true |
+
+
+ | Disable update check |
+ Disable DavMail check for new version |
+ false |
+
+
+
+
+
+
+ | Parameter |
+ Description |
+ Sample value |
+
+
+ | Allow remote connections |
+ Allow remote connections to the gateway (server mode) |
+ false |
+
+
+ | Bind Address |
+ Bind only to the specified network address, leave empty to listen on all network
+ interfaces
+ |
+ 10.0.1.2 |
+
+
+
+
+
+
+ | Parameter |
+ Description |
+ Sample value |
+
+
+ | Server certificate hash |
+ Manually accepted server certificate hash, contains the SHA1 hash of
+ a manually accepted certificate (invalid or self signed)
+ |
+ 9F:CC:59:82:1F:C:CD:29:7C:70:F0:D8:37:B1:77:3F:48:84:AE:C4 |
+
+
+ | Key store type |
+ To encrypt communication between client and DavMail, create a server certificate,
+ choose key store type and set key store path
+ |
+ JKS |
+
+
+ | Key store |
+ SSL certificate key store file path |
+ path/to/keystore |
+
+
+ | Key store password |
+ Key store password |
+ password |
+
+
+ | Key password |
+ SSL key password inside key store |
+ password |
+
+
+ | Client key store type |
+ When the Exchange server requires mutual authentication,
+ choose client certificate key store type, PKCS11 for smartcard,
+ PKCS12 or JKS for certificate file
+ |
+ PKCS11 |
+
+
+ | Client key store |
+ SSL client certificate key store file path |
+ path/to/keystore |
+
+
+ | Client key store password |
+ Client key store password, leave empty for runtime prompt |
+ password |
+
+
+ | PKCS11 library |
+ PKCS11 (smartcard) library path (.so or .dll) |
+ softokn3.dll |
+
+
+ | PKCS11 config |
+ Optional additional PKCS11 settings (slot, nssArgs, ...) |
+ slot=2 |
+
+
+
+
+
+
+ | Parameter |
+ Description |
+ Sample value |
+
+
+ | Keep Delay (POP) |
+ Number of days to keep messages in Exchange trash folder before actual deletion,
+ only for POP service
+ |
+ 30 |
+
+
+ | Sent Keep Delay (POP) |
+ Number of days to keep sent messages in Exchange sent folder,
+ only for POP service
+ |
+ 90 |
+
+
+
+
+
+
+ | Parameter |
+ Description |
+ Sample value |
+
+
+ | Calendar past events (Caldav) |
+ Get events in the past not older than specified days count, leave empty for no limits |
+ 90 |
+
+
+ | Edit Caldav notifications |
+ Enable interactive Caldav edit notification window |
+ false |
+
+
+ | Force Active Sync update |
+ Use double event update to trigger ActiveSync mobile phones sync, only in WebDav mode |
+ false |
+
+
+ | Caldav alarm sound |
+ Convert Caldav alarm to sound alarm supported by iCal, e.g. Basso. Leave empty for no
+ conversion
+ |
+ Basso |
+
+
+
+
+
+
+ | Parameter |
+ Description |
+ Sample value |
+
+
+ | IDLE folder monitor delay (IMAP): |
+ IMAP folder idle monitor delay in minutes, leave empty to disable IDLE support |
+ 1 |
+
+
+ | IMAP auto expunge |
+ Delete messages immediately on the server over IMAP |
+ true |
+
+
+
+
+
+
+ | Parameter |
+ Description |
+ Sample value |
+
+
+ | Logging levels |
+ Default, DavMail and HttpClient logging levels, see Log4J documentation for more details
+ |
+ WARN |
+
+
+ | Log file Path |
+ DavMail log file path (default is davmail.log in working directory on Unix and Windows,
+ ~/Library/Logs/DavMail/davmail.log on OSX)
+ |
+ davmail.log |
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/site/xdoc/gettingstarted.xml b/src/site/xdoc/gettingstarted.xml
index b11ce1be..86dbe8aa 100644
--- a/src/site/xdoc/gettingstarted.xml
+++ b/src/site/xdoc/gettingstarted.xml
@@ -18,7 +18,7 @@
- The following table describes the main and advanced options :
+ The following table describes the main options :
| Parameter |
@@ -58,154 +58,10 @@
Local LDAP server port to configure in directory (address book) client |
389 |
-
- | Keep Delay (POP) |
- Number of days to keep messages in Exchange trash folder before actual deletion,
- only for POP service
- |
- 30 |
-
-
- | Sent Keep Delay (POP) |
- Number of days to keep sent messages in Exchange sent folder,
- only for POP service |
- 90 |
-
-
- | Calendar past events (Caldav) |
- Get events in the past not older than specified days count, leave empty for no limits |
- 90 |
-
-
- | IDLE folder monitor delay (IMAP): |
- IMAP folder idle monitor delay in minutes, leave empty to disable IDLE support |
- 1 |
-
-
- | Allow remote connections |
- Allow remote connections to the gateway (server mode) |
- false |
-
-
- | Edit Caldav notifications |
- Enable interactive Caldav edit notification window |
- false |
-
-
- | Force Active Sync update |
- Use double event update to trigger ActiveSync mobile phones sync |
- false |
-
-
- | IMAP auto expunge |
- Delete messages immediately on the server over IMAP |
- true |
-
-
- | Enable EWS |
- Enable EWS mode on Exchange 2010 or Exchange 2007 with Webdav disabled |
- false |
-
-
- | Display startup banner |
- Whether to show the initial startup notification window or not |
- true |
-
-
- | Caldav alarm sound |
- Convert Caldav alarm to sound alarm supported by iCal, e.g. Basso. Leave empty for no
- conversion
- |
- Basso |
-
-
- | Default domain |
- Default windows domain name |
- DOMAIN |
-
-
- | Key store type |
- To encrypt communication between client and DavMail, create a server certificate,
- choose key store type and set key store path
- |
- JKS |
-
-
- | Key store |
- SSL certificate key store file path |
- path/to/keystore |
-
-
- | Key store password |
- Key store password |
- password |
-
-
- | Key password |
- SSL key password inside key store |
- password |
-
-
- | Client key store type |
- When the Exchange server requires mutual authentication,
- choose client certificate key store type, PKCS11 for smartcard,
- PKCS12 or JKS for certificate file
- |
- PKCS11 |
-
-
- | Client key store |
- SSL client certificate key store file path |
- path/to/keystore |
-
-
- | Client key store password |
- Client key store password, leave empty for runtime prompt |
- password |
-
-
- | PKCS11 library |
- PKCS11 (smartcard) library path (.so or .dll) |
- softokn3.dll |
-
-
- | PKCS11 config |
- Optional additional PKCS11 settings (slot, nssArgs, ...) |
- slot=2 |
-
-
- | Bind Address |
- Bind only to the specified network address |
- 10.0.1.2 |
-
-
- | Server certificate hash |
- Manually accepted server certificate hash, contains the SHA1 hash of
- a manually accepted certificate (invalid or self signed)
- |
- 9F:CC:59:82:1F:C:CD:29:7C:70:F0:D8:37:B1:77:3F:48:84:AE:C4 |
-
-
- | Disable update check |
- Disable DavMail check for new version |
- false |
-
-
- | Logging levels |
- Default, DavMail and HttpClient logging levels, see Log4J documentation for more details
- |
- WARN |
-
-
- | Log file Path |
- DavMail log file path (default is davmail.log in working directory on Unix and Windows,
- ~/Library/Logs/DavMail/davmail.log on OSX)
- |
- davmail.log |
-
Uncheck a port to disable matching service.
Activate panel under Proxy tab to set an HTTP proxy and associated credentials if needed
+ If you need to adjust other advanced settings, check Advanced settings
Proceed to
Thunderbird mail setup
or
diff --git a/src/site/xdoc/iphonecaldavsetup.xml b/src/site/xdoc/iphonecaldavsetup.xml
index f9ad7aa4..ddcd5780 100644
--- a/src/site/xdoc/iphonecaldavsetup.xml
+++ b/src/site/xdoc/iphonecaldavsetup.xml
@@ -1,67 +1,67 @@
-
-
-
-
- DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - iPhone Caldav setup
- Mickael Guessant
-
-
-
-
-
- Note: you can't install DavMail directly on an iPhone, you need a separate DavMail server,
- seeiPhone setup.
-
-
-
- Open iPhone Settings application and choose Mail, Contacts, Calendar:
-
-
-
-
Then select Add Account...:
-
-
-
-
DavMail is not an Exchange ActiveSync server, press Other:
-
-
-
-
Choose Add CalDAV Account:
-
-
-
-
Enter your DavMail server hostname in the Server field,
- append ':' and port if DavMail HTTP (Caldav and Carddav) port is not 80,
- provide your username and password then press Next:
-
-
-
-
On the account page, open Advanced Settings:
-
-
-
-
Enable SSL and check port, make sure Account URL is
- https://davmailhost:1080/principals/users/username@ompany.com:
-
-
-
-
Note: you can't install DavMail directly on an iPhone, you need a separate DavMail server,
+ see iPhone setup.
+
+
+
+ Open iPhone Settings application and choose Mail, Contacts, Calendar:
+
+
+
+
Then select Add Account...:
+
+
+
+
DavMail is not an Exchange ActiveSync server, press Other:
+
+
+
+
Choose Add CalDAV Account:
+
+
+
+
Enter your DavMail server hostname in the Server field,
+ append ':' and port if DavMail HTTP (Caldav and Carddav) port is not 80,
+ provide your username and password then press Next:
+
+
+
+
On the account page, open Advanced Settings:
+
+
+
+
Enable SSL and check port, make sure Account URL is
+ https://davmailhost:1080/principals/users/username@company.com:
+
+
+
+
Note: you can't install DavMail directly on an iPhone, you need a separate DavMail server,
- seeiPhone setup.
-
-
-
- Open iPhone Settings application and choose Mail, Contacts, Calendar:
-
-
-
-
Then select Add Account...:
-
-
-
-
DavMail is not an Exchange ActiveSync server, press Other:
-
-
-
-
Choose Add CardDAV Account:
-
-
-
-
Enter your DavMail server hostname in the Server field,
- append ':' and port if DavMail HTTP (Caldav and Carddav) port is not 80,
- provide your username and password then press Next:
-
-
-
-
On the account page, open Advanced Settings:
-
-
-
-
Enable SSL and check port:
-
-
-
-
Contact setup is complete, proceed to
- iPhone Caldav setup
-
-
-
-
+
+
+
+
+ DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - iPhone Carddav setup
+ Mickael Guessant
+
+
+
+
+
+ Note: you can't install DavMail directly on an iPhone, you need a separate DavMail server,
+ see iPhone setup.
+
+
+
+ Open iPhone Settings application and choose Mail, Contacts, Calendar:
+
+
+
+
Then select Add Account...:
+
+
+
+
DavMail is not an Exchange ActiveSync server, press Other:
+
+
+
+
Choose Add CardDAV Account:
+
+
+
+
Enter your DavMail server hostname in the Server field,
+ append ':' and port if DavMail HTTP (Caldav and Carddav) port is not 80,
+ provide your username and password then press Next:
+
+
+
+
On the account page, open Advanced Settings:
+
+
+
+
Enable SSL and check port:
+
+
+
+
Contact setup is complete, proceed to
+ iPhone Caldav setup
+
+
+
+
\ No newline at end of file
diff --git a/src/site/xdoc/iphonemailsetup.xml b/src/site/xdoc/iphonemailsetup.xml
index 18b07f6b..10145b78 100644
--- a/src/site/xdoc/iphonemailsetup.xml
+++ b/src/site/xdoc/iphonemailsetup.xml
@@ -1,145 +1,145 @@
-
-
-
-
- DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - iPhone Mail setup
- Mickael Guessant
-
-
-
-
-
- Note: you can't install DavMail directly on an iPhone, you need a separate DavMail server,
- seeiPhone setup.
-
-
-
- Open iPhone Settings application and choose Mail, Contacts, Calendar:
-
-
-
-
Then select Add Account...:
-
-
-
-
DavMail is not an Exchange ActiveSync server, press Other:
-
-
-
-
Choose Add Mail Account:
-
-
-
-
Enter your name, email address and password, then press Next:
-
-
-
-
Select IMAP account type:
-
-
-
-
In Incoming Mail Server section, enter your DavMail server hostname,
- append ':' and port if DavMail IMAP port is not 143:
-
-
-
-
In Outgoing Mail Server section, enter your DavMail server hostname,
- do not append port, this is not supported by current iOS version, then press Next:
-
-
-
-
Wait until your iPhone has finished verifying all possible port/protocol combination:
-
-
-
-
If you get the
- Cannot Connect Using SSL
- message, just select Yes,
- you will just need to adjust account settings later.
-
-
-
-
Save the account:
-
-
-
-
Confirm:
-
-
-
-
Back to account settings page, still need to fix SMTP port
- if DavMail is not listening on default port 25,
- open account settings:
-
-
-
-
Open Account Info:
-
-
-
-
Open SMTP page:
-
-
-
-
Choose primary server:
-
-
-
-
Adjust SMTP port:
-
-
-
-
Back to Account Info, open Advanced settings:
-
-
-
-
Back to Account Info, open Advanced settings:
-
-
-
-
Enable SSL on IMAP port:
-
-
-
-
Mail setup is complete, proceed to
- iPhone Carddav setup
-
-
-
-
+
+
+
+
+ DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - iPhone Mail setup
+ Mickael Guessant
+
+
+
+
+
+ Note: you can't install DavMail directly on an iPhone, you need a separate DavMail server,
+ see iPhone setup.
+
+
+
+ Open iPhone Settings application and choose Mail, Contacts, Calendar:
+
+
+
+
Then select Add Account...:
+
+
+
+
DavMail is not an Exchange ActiveSync server, press Other:
+
+
+
+
Choose Add Mail Account:
+
+
+
+
Enter your name, email address and password, then press Next:
+
+
+
+
Select IMAP account type:
+
+
+
+
In Incoming Mail Server section, enter your DavMail server hostname,
+ append ':' and port if DavMail IMAP port is not 143:
+
+
+
+
In Outgoing Mail Server section, enter your DavMail server hostname,
+ do not append port, this is not supported by current iOS version, then press Next:
+
+
+
+
Wait until your iPhone has finished verifying all possible port/protocol combination:
+
+
+
+
If you get the
+ Cannot Connect Using SSL
+ message, just select Yes,
+ you will just need to adjust account settings later.
+
+
+
+
Save the account:
+
+
+
+
Confirm:
+
+
+
+
Back to account settings page, still need to fix SMTP port
+ if DavMail is not listening on default port 25,
+ open account settings:
+
+
+
+
Open Account Info:
+
+
+
+
Open SMTP page:
+
+
+
+
Choose primary server:
+
+
+
+
Adjust SMTP port:
+
+
+
+
Back to Account Info, open Advanced settings:
+
+
+
+
Back to Account Info, open Advanced settings:
+
+
+
+
Enable SSL on IMAP port:
+
+
+
+
Mail setup is complete, proceed to
+ iPhone Carddav setup
+
+
+
+
\ No newline at end of file
diff --git a/src/site/xdoc/thunderbirdcarddavsetup.xml b/src/site/xdoc/thunderbirdcarddavsetup.xml
index 301cf263..f1ee8d66 100644
--- a/src/site/xdoc/thunderbirdcarddavsetup.xml
+++ b/src/site/xdoc/thunderbirdcarddavsetup.xml
@@ -1,51 +1,50 @@
-
-
-
-
- DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Thunderbird Carddav setup
- Mickael Guessant
-
-
-
-
-
- Thunderbird does not support Carddav natively, you will need to download and install the SOGo Connector
- plugin from
- SOGo Connector Thunderbird extension.
-
- Note: the SOGo connector is not yet available for thunderbird 3.
-
-
- After plugin installation, restart Thunderbird, open address book and choose
- File / New / Remote Address Book:
-
-
-
-
Choose a name and enter contact folder location (adjust port to your settings):
- http://localhost:1080/users/mail@company.com/contacts
-
- Replace mail@company.com with actual user email address.
-
-
-
-
Press OK and launch synchronisation with the toolbar
- Synchronize
- button.
-
-
- Provide your credentials, login is Active Directory account name, i.e. domain\account
- or email address with Exchange 2007
-
-
-
-
Thunderbird does not support Carddav natively, you will need to download and install the SOGo Connector
+ plugin from
+ SOGo Connector Thunderbird extension.
+
+
+
+ After plugin installation, restart Thunderbird, open address book and choose
+ File / New / Remote Address Book:
+
+
+
+
Choose a name and enter contact folder location (adjust port to your settings):
+ http://localhost:1080/users/mail@company.com/contacts
+
+ Replace mail@company.com with actual user email address.
+
+
+
+
Press OK and launch synchronisation with the toolbar
+ Synchronize
+ button.
+
+
+ Provide your credentials, login is Active Directory account name, i.e. domain\account
+ or email address with Exchange 2007
+
+
+
+