diff options
| -rw-r--r-- | content/etc/davmail/davmail.properties.template | 46 | ||||
| -rwxr-xr-x | content/opt/davmail/davmail | 2 |
2 files changed, 27 insertions, 21 deletions
diff --git a/content/etc/davmail/davmail.properties.template b/content/etc/davmail/davmail.properties.template index 1b8ad39..fa0d3af 100644 --- a/content/etc/davmail/davmail.properties.template +++ b/content/etc/davmail/davmail.properties.template @@ -10,12 +10,18 @@ davmail.enableEws=auto # base Exchange OWA or EWS url davmail.url=${DAVMAIL_URL} -# Listener ports +# Listener ports (SSL is not working for some reason) +#davmail.caldavPort=1080 +#davmail.imapPort=1993 +#davmail.ldapPort=1636 +#davmail.popPort=1995 +#davmail.smtpPort=1587 +davmail.ldapPort=1389 davmail.caldavPort=1080 -davmail.imapPort=1993 -davmail.ldapPort=1636 -davmail.popPort=1995 -davmail.smtpPort=1587 +davmail.smtpPort=1025 +davmail.popPort=1110 +davmail.imapPort=1143 + ############################################################# # Network settings @@ -39,20 +45,20 @@ davmail.bindAddress= davmail.clientSoTimeout= # DavMail listeners SSL configuration -davmail.ssl.keystoreType=${DAVMAIL_SSL_PASS:+PKCS12} -davmail.ssl.keystoreFile=${DAVMAIL_SSL_PASS:+/etc/davmail/davmail.p12} -davmail.ssl.keystorePass=${DAVMAIL_SSL_PASS} -davmail.ssl.keyPass=${DAVMAIL_SSL_PASS} +#davmail.ssl.keystoreType=${DAVMAIL_SSL_PASS:+PKCS12} +#davmail.ssl.keystoreFile=${DAVMAIL_SSL_PASS:+/etc/davmail/davmail.p12} +#davmail.ssl.keystorePass=${DAVMAIL_SSL_PASS} +#davmail.ssl.keyPass=${DAVMAIL_SSL_PASS} # Accept specified certificate even if invalid according to trust store -davmail.server.certificate.hash=${DAVMAIL_SERVER_CERTIFICATE_HASH} +#davmail.server.certificate.hash=${DAVMAIL_SERVER_CERTIFICATE_HASH} # disable SSL for specified listeners -davmail.ssl.nosecurecaldav=false -davmail.ssl.nosecureimap=false -davmail.ssl.nosecureldap=false -davmail.ssl.nosecurepop=false -davmail.ssl.nosecuresmtp=false +#davmail.ssl.nosecurecaldav=false +#davmail.ssl.nosecureimap=false +#davmail.ssl.nosecureldap=false +#davmail.ssl.nosecurepop=false +#davmail.ssl.nosecuresmtp=false # disable update check davmail.disableUpdateCheck=true @@ -117,13 +123,13 @@ log4j.rootLogger=WARN # Workstation only settings # smartcard access settings -davmail.ssl.pkcs11Config= -davmail.ssl.pkcs11Library= +#davmail.ssl.pkcs11Config= +#davmail.ssl.pkcs11Library= # SSL settings for mutual authentication -davmail.ssl.clientKeystoreType= -davmail.ssl.clientKeystoreFile= -davmail.ssl.clientKeystorePass= +#davmail.ssl.clientKeystoreType= +#davmail.ssl.clientKeystoreFile= +#davmail.ssl.clientKeystorePass= # disable all balloon notifications davmail.disableGuiNotifications=false diff --git a/content/opt/davmail/davmail b/content/opt/davmail/davmail index 051bbdd..ab83787 100755 --- a/content/opt/davmail/davmail +++ b/content/opt/davmail/davmail @@ -6,7 +6,7 @@ # BASE=`dirname $0` # force GTK2 to avoid crash with OpenJDK 11 -JAVA_OPTS="-Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=2.2" +JAVA_OPTS="" #JAVA_OPTS="-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=2.2" JAVA=java # uncomment this to force JDK 8 |