Updated dovecot

dovecot/Dockerfile

@@ -1,39 +1,14 @@
-FROM debian:jessie
+FROM debian:stretch
 
-MAINTAINER Robin Thoni <robin@rthoni.com>
+ADD https://raw.githubusercontent.com/docker-gcf/docker-gcf/v1.5.0/setup.sh /tmp/docker-utils-setup.sh
+RUN sh /tmp/docker-utils-setup.sh
+ENTRYPOINT ["gcf-entrypoint"]
+CMD ["dovecot", "-F"]
 
-RUN groupadd -r email --gid=7788 && useradd -r -g email --uid=7788 email
+ENV DOVECOT_VERSION=1:2.2.*
 
-RUN apt-get update &&\
-    apt-get install -y dovecot-imapd dovecot-pop3d dovecot-sieve dovecot-managesieved dovecot-pgsql dovecot-ldap dovecot-lmtpd exim4 &&\
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN groupadd -r email --gid=7788 && useradd -r -g email --uid=7788 email &&\
+    pkgs-install dovecot-imapd=${DOVECOT_VERSION} dovecot-sieve=${DOVECOT_VERSION} dovecot-managesieved=${DOVECOT_VERSION} \
+                 dovecot-pgsql=${DOVECOT_VERSION} dovecot-ldap=${DOVECOT_VERSION} dovecot-lmtpd=${DOVECOT_VERSION}
 
-RUN rm -rf /etc/dovecot/*
-
-COPY ./config/ /etc/dovecot/
-
-COPY ./exim4/ /etc/exim4/
-
-RUN chown root:Debian-exim /etc/exim4/passwd.client &&\
-    update-exim4.conf
-
-RUN rm -rf /var/log/* &&\
-    mkdir -p /var/log/exim4/ &&\
-    ln -s /dev/stdout /var/log/exim4/mainlog &&\
-    ln -s /dev/stderr /var/log/exim4/paniclog
-
-COPY ./sieve/ /etc/dovecot/sieve/
-
-COPY ./vars-vars /etc/vars-vars
-
-COPY ./vars-files /etc/vars-files
-
-COPY ./run.sh /run.sh
-
-VOLUME ["/var/email"]
-
-EXPOSE 110 143 993 995 4190
-
-CMD ["/run.sh"]
-
-COPY ./certs/ /etc/ssl/private/
+COPY ./config /etc/salt/base/

dovecot/config/dovecot-pgsql.conf

@@ -1,5 +0,0 @@
-driver = pgsql
-connect = host=POSTGRES_HOST dbname=POSTGRES_DB user=POSTGRES_USER password=POSTGRES_PASSWORD
-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/states/dovecot/config/dovecot-pgsql.conf

@@ -0,0 +1,5 @@
+driver = pgsql
+connect = host={{ salt['pillar.get']("model:postgres:host") }} dbname={{ salt['pillar.get']("model:postgres:database") }} user={{ salt['pillar.get']("model:postgres:user") }} password={{ salt['pillar.get']("model:postgres:password") }}
+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 → dovecot/config/states/dovecot/config/dovecot.conf

@@ -1,24 +1,34 @@
-# 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
+mail_debug = yes
+
+ssl_cert = </etc/ssl/certs/fullchain.pem
+ssl_key = </etc/ssl/certs/privkey.pem
+
+log_timestamp = "%Y-%m-%d %H:%M:%S "
+log_path = /dev/stderr
+
+postmaster_address = {{ salt['pillar.get']("model:dovecot:postmaster") }}
+
+protocols = imap sieve lmtp
+
 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
+    port = {{ salt['pillar.get']("model:dovecot:sasl:port") }}
     address = 0.0.0.0
   }
   unix_listener auth-master {
@@ -27,17 +37,16 @@ service auth {
     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
+  postmaster_address = {{ salt['pillar.get']("model:dovecot:postmaster") }}
 }
 
 protocol lmtp {
@@ -60,14 +69,10 @@ service managesieve-login {
   }
 }
 
-log_path = /dev/stderr
-
-postmaster_address = postmaster@example.org
-
 service lmtp {
   inet_listener lmtp {
     address = 0.0.0.0
-    port = DOVECOT_LMTP_PORT
+    port = {{ salt['pillar.get']("model:dovecot:lmtp:port") }}
   }
 }
 

dovecot/config/states/dovecot/config/sieve/before/duplicates.sieve

@@ -0,0 +1,7 @@
+require ["duplicate","fileinto"];
+
+# Discard duplicates
+if allof (duplicate)
+{
+	discard;
+}

dovecot/config/states/dovecot/init.sls

@@ -0,0 +1,12 @@
+dovecot-config:
+  file.recurse:
+    - name: /etc/dovecot
+    - source: salt://dovecot/config
+    - template: jinja
+    - clean: True
+    - user: 7788
+    - group: 7788
+
+dovecot-pid-file:
+  file.absent:
+    - name: /var/run/dovecot/master.pid

dovecot/exim4/passwd.client

@@ -1 +0,0 @@
-EXIM_SMARTHOST_HOST:EXIM_SMARTHOST_USER:EXIM_SMARTHOST_PASSWORD

dovecot/exim4/update-exim4.conf.conf

@@ -1,31 +0,0 @@
-# /etc/exim4/update-exim4.conf.conf
-#
-# Edit this file and /etc/mailname by hand and execute update-exim4.conf
-# yourself or use 'dpkg-reconfigure exim4-config'
-#
-# Please note that this is _not_ a dpkg-conffile and that automatic changes
-# to this file might happen. The code handling this will honor your local
-# changes, so this is usually fine, but will break local schemes that mess
-# around with multiple versions of the file.
-#
-# update-exim4.conf uses this file to determine variable values to generate
-# exim configuration macros for the configuration file.
-#
-# Most settings found in here do have corresponding questions in the
-# Debconf configuration, but not all of them.
-#
-# This is a Debian specific file
-
-dc_eximconfig_configtype='smarthost'
-dc_other_hostnames=''
-dc_local_interfaces='127.0.0.1 ; ::1'
-dc_readhost=''
-dc_relay_domains=''
-dc_minimaldns='false'
-dc_relay_nets=''
-dc_smarthost='EXIM_SMARTHOST_HOST::587'
-CFILEMODE='644'
-dc_use_split_config='true'
-dc_hide_mailname='false'
-dc_mailname_in_oh='true'
-dc_localdelivery='mail_spool'

dovecot/run.sh

@@ -1,33 +0,0 @@
-#! /usr/bin/env bash
-
-replace_var()
-{
-  file="${1}"
-  var="${2}"
-  sed -e "s?${var}?${!var}?g" -i "${file}"
-}
-
-replace_vars()
-{
-  file="${1}"
-  for var in $(cat /etc/vars-vars)
-  do
-    replace_var "${file}" "${var}"
-  done
-}
-
-replace_files()
-{
-  for file in $(cat /etc/vars-files)
-  do
-    replace_vars "${file}"
-  done
-}
-
-replace_files
-
-rm -f /var/run/dovecot/master.pid &&
-rm -f /var/run/exim4/exim.pid &&
-service exim4 start &&
-
-dovecot -F

dovecot/sieve/before/spam.sieve

@@ -1,9 +0,0 @@
-## Generated by Vacation Sieve plugin for roundcube, the Fri, 04 Nov 2016 00:24:07 +0000 ##
-
-require ["fileinto","variables"];
-set "subject" "";
-# rule:[spam]
-if header :contains "subject" "[SPAM]"
-{
-	fileinto "Junk";
-}

dovecot/vars-files

@@ -1,4 +0,0 @@
-/etc/dovecot/dovecot.conf
-/etc/dovecot/dovecot-pgsql.conf
-/etc/exim4/update-exim4.conf.conf
-/etc/exim4/passwd.client

dovecot/vars-vars

@@ -1,23 +0,0 @@
-POSTGRES_HOST
-POSTGRES_USER
-POSTGRES_PASSWORD
-POSTGRES_DB
-
-MAIL_DOMAIN
-MAIL_HOSTNAME
-
-DOVECOT_HOST
-DOVECOT_SASL_PORT
-DOVECOT_LMTP_PORT
-
-POSTFIX_HOST
-
-OPENDKIM_HOST
-OPENDKIM_PORT
-
-MILTER_SASL_HOST
-MILTER_SASL_PORT
-
-EXIM_SMARTHOST_HOST
-EXIM_SMARTHOST_USER
-EXIM_SMARTHOST_PASSWORD