working dovecot

.gitignore

@@ -1,4 +1,4 @@
 *.swp
-/data/postgresql/data
+/data
 /postfix/certs/*.crt
 /postfix/certs/*.key

docker-compose.yml

@@ -11,7 +11,7 @@ services:
         volumes:
             - ./data/postgresql/data:/var/lib/postgresql/data
         ports:
-            - "127.0.0.1:34000:5432"
+            - "34000:5432"
         env_file:
             - env
 
@@ -23,7 +23,7 @@ services:
                 aliases:
                     - postfixadmin.internal.docker
         ports:
-            - "127.0.0.1:34001:80"
+            - "34001:80"
         env_file:
             - env
 
@@ -34,13 +34,29 @@ services:
             internal.docker:
                 aliases:
                     - postfix.internal.docker
-        volumes:
-          - ./data/email:/var/email
         ports:
             - "0.0.0.0:25:25"
             - "0.0.0.0:587:587"
         env_file:
             - env
 
+    dovecot:
+        build: ./dovecot
+        container_name: mx-dovecot
+        networks:
+            internal.docker:
+                aliases:
+                    - dovecot.internal.docker
+        volumes:
+            - ./data/email:/var/email
+        ports:
+            - "0.0.0.0:110:110"
+            - "0.0.0.0:143:143"
+            - "0.0.0.0:993:993"
+            - "0.0.0.0:995:995"
+            - "0.0.0.0:4190:4190"
+        env_file:
+            - env
+
 networks:
     internal.docker:

dovecot/Dockerfile

@@ -0,0 +1,24 @@
+FROM debian:jessie
+
+MAINTAINER Robin Thoni <robin@rthoni.com>
+
+RUN groupadd -r email --gid=7788 && useradd -r -g email --uid=7788 email
+
+
+RUN apt-get update &&\
+    apt-get install -y dovecot-imapd dovecot-pop3d dovecot-sieve dovecot-managesieved dovecot-pgsql dovecot-lmtpd &&\
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY ./run.sh /run.sh
+
+RUN rm -rf /etc/dovecot/*
+
+COPY ./config/ /etc/dovecot/
+
+COPY ./certs/ /etc/ssl/private/
+
+VOLUME ["/var/email"]
+
+EXPOSE 110 143 993 995 4190
+
+CMD ["/run.sh"]

dovecot/certs/mail-chain.crt

@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----

dovecot/certs/mail.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFCDCCA/CgAwIBAgISA0bw/dFjshZheK4A2j6abebZMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMzAxODEzMDBaFw0x
+NzAxMjgxODEzMDBaMB0xGzAZBgNVBAMTEnRlc3QtbXgucnRob25pLmNvbTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKp8OjTs7mjy080st3qirKfyiuAI
+lFGeWKTz3mvOXHNCyN8zyCyVbdYc6IdWJU/tAOJDfJ/5SEhOCgENe1SMckCXte1e
+P6ze8XjcI4XPuj4h+SfNPqHv5EGuy+OpRjiKEIzQLSXuNVrGbIqRpsKtiNznu0Y9
+CEL9yUI+kpQ/wcotYAMQZPm2WRqqdw2/bhD4scrjy8ROKqNlz9DVN1eRHY3Fp6F6
+/yYZ2Gv1xKNpjEBrw/PwtT9ZHMOJAY088/zxnD1GZfHbqTl+st48UWDhbL3hPO9b
+yeS0WUfZIOOy3jaMv0JNh9RIWwtXhdAhzY6l22T5DodaJobxU7Un1nwHH2cCAwEA
+AaOCAhMwggIPMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUGOVIHyzyoCunUe5qme2R
+XK3+5bQwHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwcAYIKwYBBQUH
+AQEEZDBiMC8GCCsGAQUFBzABhiNodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5
+cHQub3JnLzAvBggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNy
+eXB0Lm9yZy8wHQYDVR0RBBYwFIISdGVzdC1teC5ydGhvbmkuY29tMIH+BgNVHSAE
+gfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAmBggrBgEFBQcCARYa
+aHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUFBwICMIGeDIGbVGhp
+cyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBvbiBieSBSZWx5aW5n
+IFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBDZXJ0aWZp
+Y2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5jcnlwdC5vcmcvcmVw
+b3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAAj8JtQIVKgwX/Clbn1diDvLB2f1
+g8/iZS2tggoMgwkwQXVwQXP8RIsvsMzo2LUss3Rkyahn+kB+EyN6nQHu0NC5qVoj
+ZPz13BqiQDgI07tpZLP9UlEroabf7jEaHL8/jM9Dg+6DnX4vUAEPw25cW98yih+v
+xSk50sq0NkBK26+Id+Yh7F6FlHXOoBespgia17NVVVkhOnTIuwLGvAPgS3N6dn5r
+bVjiEAGRnC2YPmIhQjbhuxDYJjYg1BXMhpGTp/SeI4Rh182TJq3hqt5Vdsa8xLpS
+G00CWC3Qo9DoM0ct+iLWXuVtKiMLGSPY53vASmfwSvQ9hcsJ6pFrZ2vbiI4=
+-----END CERTIFICATE-----

dovecot/certs/mail.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCqfDo07O5o8tPN
+LLd6oqyn8orgCJRRnlik895rzlxzQsjfM8gslW3WHOiHViVP7QDiQ3yf+UhITgoB
+DXtUjHJAl7XtXj+s3vF43COFz7o+IfknzT6h7+RBrsvjqUY4ihCM0C0l7jVaxmyK
+kabCrYjc57tGPQhC/clCPpKUP8HKLWADEGT5tlkaqncNv24Q+LHK48vETiqjZc/Q
+1TdXkR2Nxaehev8mGdhr9cSjaYxAa8Pz8LU/WRzDiQGNPPP88Zw9RmXx26k5frLe
+PFFg4Wy94TzvW8nktFlH2SDjst42jL9CTYfUSFsLV4XQIc2Opdtk+Q6HWiaG8VO1
+J9Z8Bx9nAgMBAAECggEAVvX45sg4L9Y1DUIS8P4LXbuM9QvLQ/qmMrWmLY1cgPp+
+5cNPBtbN6NpkDax2add1jPRpnFwWb7NGzRSoZQ8itCnuhX5+sloiB8kaYYX89PZ1
+VcUOfqGT56EWpTDR/cMHAByr+t4P3xa5hNEYo9LKrguR7hjxnuI/B4hNUktXOR2o
+oz9WXgDeFs5tqfE9oyqiJz3/niSeCTTyZ6jYAsAF3dOcc+PDS7w2LykOoxkIC5M8
+fBWbgPHUHGcIQC2+Qytw1BdxEqD8KOTyI/jjNjRz1yj57n4hVbcOaPn8UkTI+Gq/
+wsjq45TUWeFAu0GVmJ7P8FVZfgo28DOBLR5Yl2RqSQKBgQDcBPeWWeOOuQquYxXp
+21pE3NuFkw949eXz//nVBgl5YJG6G6UA7QYK38uxeqOgICgXvDUpC21GseoI/3Oq
+5IRuZlqfFFW+asoqRoMb3l3bpkfQ27Ljky2smxpIzRDLC8+TLAcflzN7rFNrstlB
+wmNfTEEhpBdZNu3YRQywVL3JZQKBgQDGXYgHC8bX5IDhUKKctE+jKD9YFowXoVyS
+zqo07rfYBcSdyJy5loRC9xGITYbJ3fd5lou95i6fEybH6ohZi6a+knLVGd4tcs7i
+ceKNoztISF3zA+Q0aJLfbpElenpCTO8lqGhpSqVjOLawpuFa+fehhyEts8aauHFR
+e4UpR6oe2wKBgEQw5eubgIPDpiPWYfxRF/Ev4nnL0ofS7qppM61qaZVM8N2Vo9Zd
+n/nO0vr236/JR6PTmUZXXE8E5VxUkCzvFnyBDKUxUEHsJyxjHk+M49on9yosbY1L
+GGTezY6yv/mud29Nvgd0fWhfSJugmuVesh3fLHCYwwPLmnvlKsGcAhZhAoGBALZk
+ogL4jSlN7kM+xYaZNPCsvTHd6YqA0IIcjNyG83wqMZNzNshe4dZBH1nZDyrmcfrW
+tj8yO4QBNBN2T1Em23c3aWcQlf3sJtaIKOxbPtND1z7wQRD/Zq0TGVsAtxHnc62I
+oBjQjiohp7neeDASz+MyQQuo1eDF30ww60v9nSspAoGBAID/B/bSsJRbAiLPmJvm
+pody9iAZ/YLPg37m4XXP8Onw/wAIj+Lyv6AI2/Yla7hv4kmlvGwh09wWCNPultmT
+UolwmSoNqF8k5zBMuetysptgbFJInNrmKy31IpKkNWsiZVk9FMfJukS3C+SSBY+p
+bOCRTaXLqUnLFENcjkgiuX/2
+-----END PRIVATE KEY-----

dovecot/config/dovecot-dict-auth.conf.ext

@@ -0,0 +1,54 @@
+# This file is commonly accessed via passdb {} or userdb {} section in
+# conf.d/auth-dict.conf.ext
+
+# Dictionary URI
+#uri = 
+
+# Default password scheme
+default_pass_scheme = MD5
+
+# Username iteration prefix. Keys under this are assumed to contain usernames.
+iterate_prefix = userdb/
+
+# Should iteration be disabled for this userdb? If this userdb acts only as a
+# cache there's no reason to try to iterate the (partial & duplicate) users.
+#iterate_disable = no
+
+# The example here shows how to do multiple dict lookups and merge the replies.
+# The "passdb" and "userdb" keys are JSON objects containing key/value pairs,
+# for example: { "uid": 1000, "gid": 1000, "home": "/home/user" }
+
+key passdb {
+  key = passdb/%u
+  format = json
+}
+key userdb {
+  key = userdb/%u
+  format = json
+}
+key quota {
+  key = userdb/%u/quota
+  #format = value
+  # The default_value is used if the key isn't found. If default_value setting
+  # isn't specified at all (even as empty), the passdb/userdb lookup fails with
+  # "user doesn't exist".
+  default_value = 100M
+}
+
+# Space separated list of keys whose values contain key/value paired objects.
+# All the key/value pairs inside the object are added as passdb fields.
+passdb_objects = passdb
+
+#passdb_fields {
+#}
+
+# Userdb key/value object list.
+userdb_objects = userdb
+
+userdb_fields {
+  # dict:<key> refers to key names
+  quota_rule = *:storage=%{dict:quota}
+
+  # dict:<key>.<objkey> refers to the objkey inside (JSON) object
+  mail = maildir:%{dict:userdb.home}/Maildir
+}

dovecot/config/dovecot-pgsql.conf

@@ -0,0 +1,5 @@
+driver = pgsql
+connect = host=localhost dbname=postfixadmin user=postfixadmin password=fNzBE6acH5ZNLuLc
+default_pass_scheme = MD5-CRYPT
+user_query = SELECT '/var/email/%d/%n' as home, 7788 AS uid, 7788 AS gid FROM mailbox WHERE username = '%u'
+password_query = SELECT password FROM mailbox WHERE username = '%u'

dovecot/config/dovecot.conf

@@ -0,0 +1,84 @@
+# 2.1.7: /etc/dovecot/dovecot.conf
+# OS: Linux 2.6.35.8-ikhpv1 x86_64 Debian 7.6 ext3
+mail_debug = yes
+auth_mechanisms = plain login
+auth_verbose = yes
+first_valid_gid = 7788
+first_valid_uid = 7788
+last_valid_gid = 7788
+last_valid_uid = 7788
+log_timestamp = "%Y-%m-%d %H:%M:%S "
+mail_location = maildir:/var/email/%d/%n/Maildir:LAYOUT=fs
+mail_privileged_group = email
+passdb {
+  args = /etc/dovecot/dovecot-pgsql.conf
+  driver = sql
+}
+protocols = imap pop3 sieve lmtp
+service auth {
+  executable = /usr/lib/dovecot/auth
+  inet_listener {
+    port = DOVECOT_SASL_PORT
+    address = 0.0.0.0
+  }
+  unix_listener auth-master {
+    group = email
+    mode = 0600
+    user = email
+  }
+}
+ssl_ca = </etc/ssl/private/mail-chain.crt
+ssl_cert = </etc/ssl/private/mail.crt
+ssl_key = </etc/ssl/private/mail.key
+userdb {
+  args = /etc/dovecot/dovecot-pgsql.conf
+  driver = sql
+}
+protocol lda {
+  auth_socket_path = /var/run/dovecot/auth-master
+  mail_plugins = sieve
+  postmaster_address = postmaster@example.org
+}
+
+plugin {
+  # The path to the user's main active script. If ManageSieve is used, this the
+  # location of the symbolic link controlled by ManageSieve.
+  sieve = ~/.dovecot.sieve
+  sieve_before = ~/sieve/01_vacation.sieve
+  sieve_extensions = +vacation +vacation-seconds
+
+  # The default Sieve script when the user has none. This is a path to a global
+  # sieve script file, which gets executed ONLY if user's private Sieve script
+  # doesn't exist. Be sure to pre-compile this script manually using the sievec
+  # command line tool.
+  # --> See sieve_before fore executing scripts before the user's personal
+  #     script.
+  #sieve_default = /var/lib/dovecot/sieve/default.sieve
+
+  # Directory for :personal include scripts for the include extension. This
+  # is also where the ManageSieve service stores the user's scripts.
+  sieve_dir = ~/sieve
+
+  # Directory for :global include scripts for the include extension. 
+  sieve_global_dir = /etc/dovecot/sieve/global/
+  sieve_global_path = /etc/dovecot/sieve/default.sieve
+}
+
+service managesieve-login {
+  inet_listener sieve {
+    address = 0.0.0.0
+  }
+}
+
+log_path = /dev/stderr
+
+postmaster_address = postmaster@example.org
+
+service lmtp {
+  # Create inet listener only if you can't use the above UNIX socket
+  inet_listener lmtp {
+    # Avoid making LMTP visible for the entire internet
+    address = 0.0.0.0
+    port = DOVECOT_LMTP_PORT
+  }
+}

dovecot/run.sh

@@ -0,0 +1,8 @@
+#! /usr/bin/env sh
+
+sed -e "s/connect *=.*/connect = host=${POSTGRES_HOST} dbname=${POSTGRES_DB} user=${POSTGRES_USER} password=${POSTGRES_PASSWORD}/g" -i /etc/dovecot/dovecot-pgsql.conf
+
+sed -e "s/DOVECOT_LMTP_PORT/${DOVECOT_LMTP_PORT}/" -i /etc/dovecot/dovecot.conf
+sed -e "s/DOVECOT_SASL_PORT/${DOVECOT_SASL_PORT}/" -i /etc/dovecot/dovecot.conf
+
+dovecot -F

env

@@ -3,5 +3,12 @@ POSTGRES_USER=postfixadmin
 POSTGRES_PASSWORD=pg_password
 POSTGRES_DB=postfixadmin
 
-MAIL_DOMAIN=rthoni.com
-MAIL_HOSTNAME=mail.rthoni.com
+MAIL_DOMAIN=test-mx.rthoni.com
+MAIL_HOSTNAME=vm01.rthoni.com
+
+DOVECOT_HOST=dovecot.internal.docker
+DOVECOT_SASL_PORT=12345
+DOVECOT_LMTP_PORT=24
+
+OPENDKIM_HOST=opendkim.internal.docker
+OPENDKIM_PORT=12345

postfix/Dockerfile

@@ -21,8 +21,6 @@ COPY ./config/ /etc/postfix/
 
 COPY ./certs/ /etc/ssl/private/
 
-VOLUME ["/var/email"]
-
 EXPOSE 25 587
 
 CMD ["/run.sh"]

postfix/config/main.cf

@@ -33,8 +33,7 @@ mailbox_size_limit = 0
 recipient_delimiter = +
 inet_interfaces = all
 
-virtual_mailbox_base=/var/email
-recipient_bcc_maps = pgsql:/etc/postfix/recipient_bcc.cf
+recipient_bcc_maps = pgsql:/etc/postfix/pgsql_recipient_bcc.cf
 transport_maps = pgsql:/etc/postfix/pgsql_transport.cf
 virtual_mailbox_domains = pgsql:/etc/postfix/pgsql_virtual_mailbox_domains.cf
 virtual_mailbox_maps = pgsql:/etc/postfix/pgsql_virtual_mailbox_maps.cf
@@ -45,7 +44,7 @@ relay_domains = pgsql:/etc/postfix/pgsql_relay_domains.cf
 virtual_minimum_uid=100
 virtual_uid_maps=static:7788
 virtual_gid_maps=static:7788
-virtual_transport=dovecot
+virtual_transport=dovecot_24
 dovecot_destination_recipient_limit = 1
 
 
@@ -66,7 +65,7 @@ queue_directory=/var/spool/postfix
 
 
 smtpd_sasl_type=dovecot
-smtpd_sasl_path=private/auth
+smtpd_sasl_path=dovecot_12345
 smtpd_sasl_auth_enable=yes
 broken_sasl_auth_clients=yes
 smtpd_sasl_security_options=noanonymous

postfix/config/master.cf

@@ -110,5 +110,3 @@ mailman   unix  -       n       n       -       -       pipe
 dovecot   unix  -       n       n       -       -       pipe
   flags=DRhu user=email:email argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient}
 
-robotasm unix   -   n   n   -   -   pipe
-    flags=F user=email:email argv=/usr/local/bin/robotasm

postfix/run.sh

@@ -7,10 +7,12 @@ sed -e "s/dbname *=.*/dbname = ${POSTGRES_DB}/g" -i /etc/postfix/pgsql_*
 
 postconf -e mydomain="${MAIL_DOMAIN}"
 postconf -e myhostname="${MAIL_HOSTNAME}"
+postconf -e smtpd_sasl_path="inet:${DOVECOT_HOST}:${DOVECOT_SASL_PORT}"
+postconf -e virtual_transport="lmtp:inet:${DOVECOT_HOST}:${DOVECOT_LMTP_PORT}"
 
-service rsyslog start
-service postfix start
+service rsyslog start &&
+service postfix start &&
 
-sleep 3
+sleep 3 &&
 
 tail -f /var/log/mail.info

postfixadmin/run.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rm /run/apache2/apache2.pid
+rm -f /run/apache2/apache2.pid
 exec /usr/sbin/apache2ctl -D FOREGROUND