Remove connection limit dovecot

7 files changed, 9 insertions, 3 deletions

diff --git a/app/email/build/dovecot/Dockerfile b/app/email/build/dovecot/Dockerfile
index 8e57c57..cd1fd0d 100644
--- a/app/email/build/dovecot/Dockerfile
+++ b/app/email/build/dovecot/Dockerfile
@@ -11,7 +11,6 @@ RUN apt-get update && \
       dovecot-lmtpd && \
     rm -rf /etc/dovecot/*
 RUN useradd mailstore
-COPY ./conf/* /etc/dovecot/
 COPY entrypoint.sh /usr/local/bin/entrypoint
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
diff --git a/app/email/build/dovecot/conf/all_before.sieve b/app/email/build/dovecot/legacy/all_before.sieve
index 7d2e57e..7d2e57e 100644
--- a/app/email/build/dovecot/conf/all_before.sieve
+++ b/app/email/build/dovecot/legacy/all_before.sieve
diff --git a/app/email/build/dovecot/conf/dovecot-ldap.sample.conf b/app/email/build/dovecot/legacy/dovecot-ldap.sample.conf
index 472d5e8..472d5e8 100644
--- a/app/email/build/dovecot/conf/dovecot-ldap.sample.conf
+++ b/app/email/build/dovecot/legacy/dovecot-ldap.sample.conf
diff --git a/app/email/build/dovecot/conf/report-ham.sieve b/app/email/build/dovecot/legacy/report-ham.sieve
index c5a994a..c5a994a 100644
--- a/app/email/build/dovecot/conf/report-ham.sieve
+++ b/app/email/build/dovecot/legacy/report-ham.sieve
diff --git a/app/email/build/dovecot/conf/report-spam.sieve b/app/email/build/dovecot/legacy/report-spam.sieve
index 1be7389..1be7389 100644
--- a/app/email/build/dovecot/conf/report-spam.sieve
+++ b/app/email/build/dovecot/legacy/report-spam.sieve
diff --git a/app/email/build/dovecot/conf/dovecot.conf b/app/email/config/dovecot/dovecot.conf
index b0fffbf..5f89a07 100644
--- a/app/email/build/dovecot/conf/dovecot.conf
+++ b/app/email/config/dovecot/dovecot.conf
@@ -43,6 +43,8 @@ userdb {
 
 
 service imap-login {
+  service_count = 0 # performance mode. set to 1 for secure mode
+  process_min_avail = 1
   inet_listener imap {
     port = 143
   }
diff --git a/app/email/deploy/email.hcl b/app/email/deploy/email.hcl
index c0a651a..84e66b8 100644
--- a/app/email/deploy/email.hcl
+++ b/app/email/deploy/email.hcl
@@ -29,7 +29,7 @@ job "email" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_dovecot:v5"
+        image = "superboum/amd64_dovecot:v6"
         readonly_rootfs = false
         ports = [ "zauthentication_port", "imaps_port", "imap_port", "lmtp_port" ]
         command = "dovecot"
@@ -37,7 +37,7 @@ job "email" {
         volumes = [
           "secrets/ssl/certs:/etc/ssl/certs",
           "secrets/ssl/private:/etc/ssl/private",
-          "secrets/conf/dovecot-ldap.conf:/etc/dovecot/dovecot-ldap.conf",
+          "secrets/conf/:/etc/dovecot/",
           "/mnt/glusterfs/email/mail:/var/mail/",
         ]
       }
@@ -135,6 +135,11 @@ job "email" {
         destination = "secrets/conf/dovecot-ldap.conf"
         perms = "400"
       }
+      template {
+        data = file("../config/dovecot/dovecot.conf")
+        destination = "secrets/conf/dovecot.conf"
+        perms = "400"
+      }
 
       # ----- secrets ------
       template {