From e29081c8f9a19f2e9bbef4f57376f0492746ce07 Mon Sep 17 00:00:00 2001
From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 13 Sep 2013 18:39:05 +0200
Subject: [PATCH] Modifications : etc/dovecot/dovecot.conf.m4 - mise en place
 pop

---
 etc/dovecot/dovecot.conf.m4 | 43 +++++++++++++++++++++++++++----------
 etc/shorewall/rules         |  1 +
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/etc/dovecot/dovecot.conf.m4 b/etc/dovecot/dovecot.conf.m4
index 7810588..418a1e1 100644
--- a/etc/dovecot/dovecot.conf.m4
+++ b/etc/dovecot/dovecot.conf.m4
@@ -20,6 +20,16 @@ local_name imap.cyclocoop.org {
 	ssl_cert = </etc/dovecot/cyclocoop.org/imap/x509/crt+crl.self-signed.pem
 	ssl_key  = </etc/dovecot/cyclocoop.org/imap/x509/key.pem
  }
+local_name pop.LOCAL_DOMAINNAME {
+	ssl_ca   = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/crt+crl.self-signed.pem
+	ssl_cert = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/crt+crl.self-signed.pem
+	ssl_key  = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/key.pem
+ }
+local_name pop.cyclocoop.org {
+	ssl_ca   = </etc/dovecot/cyclocoop.org/pop/x509/crt+crl.self-signed.pem
+	ssl_cert = </etc/dovecot/cyclocoop.org/pop/x509/crt+crl.self-signed.pem
+	ssl_key  = </etc/dovecot/cyclocoop.org/pop/x509/key.pem
+ }
 mail_debug = yes
 mail_home = /home/mail/data/%d/%n
 mail_location = maildir:/home/mail/data/%d/%n/Maildir:INDEX=/var/lib/dovecot-index/%d/%n:CONTROL=/var/lib/dovecot-control/%d/%n
@@ -110,17 +120,6 @@ plugin {
 protocol imap {
 	mail_plugins = $mail_plugins antispam imap_acl imap_quota
  }
-service imap-login {
-	inet_listener imap {
-		address = 127.0.0.1
-		port    = 143
-		ssl     = no
-	 }
-	inet_listener imaps {
-		port = 993
-		ssl  = yes
-	 }
- }
 protocol lda {
 	auth_socket_path = /var/run/dovecot/auth-userdb
 	hostname = LOCAL_DOMAINNAME
@@ -136,6 +135,11 @@ protocol lmtp {
 	#info_log_path = /tmp/dovecot-lmtp.log
  }
 protocol pop3 {
+	pop3_client_workarounds =
+	pop3_fast_size_lookups = yes
+	pop3_lock_session = yes
+	pop3_no_flag_updates = yes
+	pop3_uidl_format = %g
  }
 protocol sieve {
 	mail_debug = yes
@@ -176,9 +180,26 @@ service imap {
 		# You may need to increase this limit if you have huge mailboxes.
 	process_limit = 1024
  }
+service imap-login {
+	inet_listener imap {
+		address = 127.0.0.1
+		port    = 143
+		ssl     = no
+	 }
+	inet_listener imaps {
+		port = 993
+		ssl  = yes
+	 }
+ }
 service pop3 {
 	process_limit = 1024
  }
+service pop3-login {
+	inet_listener pop3s {
+		port = 995
+		ssl  = yes
+	 }
+ }
 ssl = required
 ssl_ca   = </etc/dovecot/LOCAL_DOMAINNAME/imap/x509/crt+crl.self-signed.pem
 ssl_cert = </etc/dovecot/LOCAL_DOMAINNAME/imap/x509/crt+crl.self-signed.pem
diff --git a/etc/shorewall/rules b/etc/shorewall/rules
index 80fcb92..487e577 100644
--- a/etc/shorewall/rules
+++ b/etc/shorewall/rules
@@ -35,6 +35,7 @@ Fanout(ACCEPT)                net    $FW
 Managesieve(ACCEPT)           net    $FW
 Mosh(ACCEPT)                  net    $FW
 Ping(ACCEPT)                  net    $FW
+POP3S(ACCEPT)                 net    $FW
 SMTP(ACCEPT)                  net    $FW
 SMTPS(ACCEPT)                 net    $FW
 Limit(SSH,10,60):info         net    $FW         tcp   ssh
-- 
2.20.1