diff --git a/edge/config/advanced/auth-ldap/index.html b/edge/config/advanced/auth-ldap/index.html index b1393161..6ce280b3 100644 --- a/edge/config/advanced/auth-ldap/index.html +++ b/edge/config/advanced/auth-ldap/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/dovecot-master-accounts/index.html b/edge/config/advanced/dovecot-master-accounts/index.html index e86b2eb1..bf66a5c0 100644 --- a/edge/config/advanced/dovecot-master-accounts/index.html +++ b/edge/config/advanced/dovecot-master-accounts/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/full-text-search/index.html b/edge/config/advanced/full-text-search/index.html index 8920b1d3..12e9dcef 100644 --- a/edge/config/advanced/full-text-search/index.html +++ b/edge/config/advanced/full-text-search/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/ipv6/index.html b/edge/config/advanced/ipv6/index.html index b79e39ae..9174f95e 100644 --- a/edge/config/advanced/ipv6/index.html +++ b/edge/config/advanced/ipv6/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/kubernetes/index.html b/edge/config/advanced/kubernetes/index.html index a78454f2..1a1b92c9 100644 --- a/edge/config/advanced/kubernetes/index.html +++ b/edge/config/advanced/kubernetes/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/mail-fetchmail/index.html b/edge/config/advanced/mail-fetchmail/index.html index a0b9a19f..35b0d99b 100644 --- a/edge/config/advanced/mail-fetchmail/index.html +++ b/edge/config/advanced/mail-fetchmail/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/mail-forwarding/aws-ses/index.html b/edge/config/advanced/mail-forwarding/aws-ses/index.html index 6d816483..98504898 100644 --- a/edge/config/advanced/mail-forwarding/aws-ses/index.html +++ b/edge/config/advanced/mail-forwarding/aws-ses/index.html @@ -510,36 +510,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/mail-forwarding/relay-hosts/index.html b/edge/config/advanced/mail-forwarding/relay-hosts/index.html index 5f4a7a1d..f14e914d 100644 --- a/edge/config/advanced/mail-forwarding/relay-hosts/index.html +++ b/edge/config/advanced/mail-forwarding/relay-hosts/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/mail-sieve/index.html b/edge/config/advanced/mail-sieve/index.html index 75a73cf4..120f268a 100644 --- a/edge/config/advanced/mail-sieve/index.html +++ b/edge/config/advanced/mail-sieve/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/maintenance/update-and-cleanup/index.html b/edge/config/advanced/maintenance/update-and-cleanup/index.html index f55f4ec0..e155dc18 100644 --- a/edge/config/advanced/maintenance/update-and-cleanup/index.html +++ b/edge/config/advanced/maintenance/update-and-cleanup/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/optional-config/index.html b/edge/config/advanced/optional-config/index.html index 70ec383e..029972e9 100644 --- a/edge/config/advanced/optional-config/index.html +++ b/edge/config/advanced/optional-config/index.html @@ -517,36 +517,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • @@ -1503,12 +1475,12 @@

    Optional Configuration

    -

    This is a list of all configuration files and directories which are optional or automatically generated in your docker-data/dms/config/ directory.

    +

    This is a list of all configuration files and directories which are optional or automatically generated in your docker-data/dms/config/ directory. We use this path to reference the local config directory in our docs, which you should attach a volume into the container at /tmp/docker-mailserver.

    Directories

    Files

    diff --git a/edge/config/advanced/override-defaults/dovecot/index.html b/edge/config/advanced/override-defaults/dovecot/index.html index 44ebf8e5..75d4290b 100644 --- a/edge/config/advanced/override-defaults/dovecot/index.html +++ b/edge/config/advanced/override-defaults/dovecot/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/override-defaults/postfix/index.html b/edge/config/advanced/override-defaults/postfix/index.html index 5f4503bf..8fcf8a46 100644 --- a/edge/config/advanced/override-defaults/postfix/index.html +++ b/edge/config/advanced/override-defaults/postfix/index.html @@ -510,36 +510,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/override-defaults/user-patches/index.html b/edge/config/advanced/override-defaults/user-patches/index.html index 2b32dc99..150e5b55 100644 --- a/edge/config/advanced/override-defaults/user-patches/index.html +++ b/edge/config/advanced/override-defaults/user-patches/index.html @@ -510,36 +510,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/advanced/podman/index.html b/edge/config/advanced/podman/index.html index d3519794..433a42c5 100644 --- a/edge/config/advanced/podman/index.html +++ b/edge/config/advanced/podman/index.html @@ -515,36 +515,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • diff --git a/edge/config/best-practices/autodiscover/index.html b/edge/config/best-practices/autodiscover/index.html index 0cf822d6..8210adec 100644 --- a/edge/config/best-practices/autodiscover/index.html +++ b/edge/config/best-practices/autodiscover/index.html @@ -15,7 +15,7 @@ - + @@ -78,6 +78,11 @@
    + + + Skip to content + +
    @@ -512,36 +517,8 @@
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - - -
  • - - SPF + + DKIM, DMARC & SPF
  • @@ -560,6 +537,8 @@ + + Auto-discovery @@ -1421,6 +1400,8 @@ + +
    @@ -1438,8 +1419,7 @@ -

    Auto-discovery

    - +

    Auto-Discovery of Services

    Email auto-discovery means a client email is able to automagically find out about what ports and security options to use, based on the mail-server URI. It can help simplify the tedious / confusing task of adding own's email account for non-tech savvy users.

    Email clients will search for auto-discoverable settings and prefill almost everything when a user enters its email address ❤

    There exists autodiscover-email-settings on which provides IMAP/POP/SMTP/LDAP autodiscover capabilities on Microsoft Outlook/Apple Mail, autoconfig capabilities for Thunderbird or kmail and configuration profiles for iOS/Apple Mail.

    diff --git a/edge/config/best-practices/dkim/index.html b/edge/config/best-practices/dkim/index.html deleted file mode 100644 index 7e4343e1..00000000 --- a/edge/config/best-practices/dkim/index.html +++ /dev/null @@ -1,1689 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - Best Practices | DKIM - Docker Mailserver - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - Skip to content - - -
    -
    - -
    - - - - - - -
    - - -
    - -
    - - - - - - - - - -
    -
    - - - -
    -
    -
    - - - - - - -
    -
    -
    - - - -
    -
    -
    - - - -
    -
    -
    - - - -
    -
    - - - - - - - -

    DKIM

    - -

    DKIM is a security measure targeting email spoofing. It is greatly recommended one activates it.

    -
    -

    Note

    -

    See the Wikipedia page for more details on DKIM.

    -
    -

    Enabling DKIM Signature

    -

    To enable DKIM signature, you must have created at least one email account. Once its done, just run the following command to generate the signature:

    -
    ./setup.sh config dkim
    -
    -

    After generating DKIM keys, you should restart docker-mailserver. DNS edits may take a few minutes to hours to propagate.

    -

    The script should ideally be run with a volume for config attached (eg: ./docker-data/dms/config/:/tmp/docker-mailserver/), otherwise by default it will mount ./config/:/tmp/docker-mailserver/.

    -

    The default keysize when generating the signature is 4096 bits for now. If you need to change it (e.g. your DNS provider limits the size), then provide the size as the first parameter of the command:

    -
    ./setup.sh config dkim keysize <keysize>
    -
    -

    For LDAP systems that do not have any directly created user account you can run the following command (since 8.0.0) to generate the signature by additionally providing the desired domain name (if you have multiple domains use the command multiple times or provide a comma-separated list of domains):

    -
    ./setup.sh config dkim keysize <key-size> domain <example.com>[,<not-example.com>]
    -
    -

    Now the keys are generated, you can configure your DNS server with DKIM signature, simply by adding a TXT record. If you have direct access to your DNS zone file, then it's only a matter of pasting the content of docker-data/dms/config/opendkim/keys/example.com/mail.txt in your example.com.hosts zone.

    -
    $ dig mail._domainkey.example.com TXT
    ----
    -;; ANSWER SECTION
    -mail._domainkey.<DOMAIN> 300 IN TXT    "v=DKIM1; k=rsa; p=AZERTYUIOPQSDFGHJKLMWXCVBN/AZERTYUIOPQSDFGHJKLMWXCVBN/AZERTYUIOPQSDFGHJKLMWXCVBN/AZERTYUIOPQSDFGHJKLMWXCVBN/AZERTYUIOPQSDFGHJKLMWXCVBN/AZERTYUIOPQSDFGHJKLMWXCVBN/AZERTYUIOPQSDFGHJKLMWXCVBN/AZERTYUIOPQSDFGHJKLMWXCVBN"
    -
    -

    Configuration using a Web Interface

    -
      -
    1. Generate a new record of the type TXT.
    2. -
    3. Paste mail._domainkey the Name txt field.
    4. -
    5. In the Target or Value field fill in v=DKIM1; k=rsa; p=AZERTYUGHJKLMWX....
    6. -
    7. In TTL (time to live): Time span in seconds. How long the DNS server should cache the TXT record.
    8. -
    9. Save.
    10. -
    -
    -

    Note

    -

    Sometimes the key in docker-data/dms/config/opendkim/keys/example.com/mail.txt can be on multiple lines. If so then you need to concatenate the values in the TXT record:

    -
    -
    $ dig mail._domainkey.example.com TXT
    ----
    -;; ANSWER SECTION
    -mail._domainkey.<DOMAIN> 300 IN TXT "v=DKIM1; k=rsa; "
    -    "p=AZERTYUIOPQSDF..."
    -    "asdfQWERTYUIOPQSDF..."
    -
    -

    The target (or value) field must then have all the parts together: v=DKIM1; k=rsa; p=AZERTYUIOPQSDF...asdfQWERTYUIOPQSDF...

    -

    Verify-Only

    -

    If you want DKIM to only verify incoming emails, the following version of /etc/opendkim.conf may be useful (right now there is no easy mechanism for installing it other than forking the repo):

    -
    # This is a simple config file verifying messages only
    -
    -#LogWhy                 yes
    -Syslog                  yes
    -SyslogSuccess           yes
    -
    -Socket                  inet:12301@localhost
    -PidFile                 /var/run/opendkim/opendkim.pid
    -
    -ReportAddress           postmaster@example.com
    -SendReports             yes
    -
    -Mode                    v
    -
    -

    Switch Off DKIM

    -

    Simply remove the DKIM key by recreating (not just relaunching) the docker-mailserver container.

    -

    Debugging

    -
      -
    • DKIM-verifer: A add-on for the mail client Thunderbird.
    • -
    • You can debug your TXT records with the dig tool.
    • -
    -
    $ dig TXT mail._domainkey.example.com
    ----
    -; <<>> DiG 9.10.3-P4-Debian <<>> TXT mail._domainkey.example.com
    -;; global options: +cmd
    -;; Got answer:
    -;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 39669
    -;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1
    -
    -;; OPT PSEUDOSECTION:
    -; EDNS: version: 0, flags:; udp: 512
    -;; QUESTION SECTION:
    -;mail._domainkey.example.com. IN TXT
    -
    -;; ANSWER SECTION:
    -mail._domainkey.example.com. 3600 IN TXT "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxBSjG6RnWAdU3oOlqsdf2WC0FOUmU8uHVrzxPLW2R3yRBPGLrGO1++yy3tv6kMieWZwEBHVOdefM6uQOQsZ4brahu9lhG8sFLPX4MaKYN/NR6RK4gdjrZu+MYSdfk3THgSbNwIDAQAB"
    -
    -;; Query time: 50 msec
    -;; SERVER: 127.0.1.1#53(127.0.1.1)
    -;; WHEN: Wed Sep 07 18:22:57 CEST 2016
    -;; MSG SIZE  rcvd: 310
    -
    -
    -
    -

    Key sizes >=4096-bit

    -

    Keys of 4096 bits could de denied by some mail-servers. According to https://tools.ietf.org/html/rfc6376 keys are preferably between 512 and 2048 bits. See issue #1854.

    -
    - - - - - - -
    -
    - - -
    - - - -
    - - - -
    -
    -
    -
    - - - - - - - - - \ No newline at end of file diff --git a/edge/config/best-practices/spf/index.html b/edge/config/best-practices/dkim_dmarc_spf/index.html similarity index 60% rename from edge/config/best-practices/spf/index.html rename to edge/config/best-practices/dkim_dmarc_spf/index.html index 459bdb36..fa5e21d0 100644 --- a/edge/config/best-practices/spf/index.html +++ b/edge/config/best-practices/dkim_dmarc_spf/index.html @@ -12,10 +12,10 @@ - + - + @@ -25,7 +25,7 @@ - Best Practices | SPF - Docker Mailserver + DKIM, DMARC & SPF - Docker Mailserver @@ -79,7 +79,7 @@
    - + Skip to content @@ -115,7 +115,7 @@
    - Best Practices | SPF + DKIM, DMARC & SPF
    @@ -344,8 +344,6 @@ - -
    @@ -515,34 +513,6 @@ - -
  • - - DKIM - -
  • - - - - - - - - - -
  • - - DMARC - -
  • - - - - - - - - @@ -551,14 +521,16 @@ + + - SPF + DKIM, DMARC & SPF @@ -567,6 +539,8 @@ + +