From 018935b89b52af6fa871437e6d1300b4f9cf1c3b Mon Sep 17 00:00:00 2001
From: theonlydoo <theonlydoo@github.com>
Date: Sun, 9 Nov 2014 12:02:03 +0100
Subject: [PATCH] conversion configuration pour dovecot 2, sur debian 7

---
 roles/mail/tasks/main.yml         |  2 +-
 roles/mail/templates/dovecot.conf | 76 ++++++++++++++-----------------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 75446d7..87db6b4 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -9,7 +9,7 @@
 
 - name: Randomly generate a postfix database password
   shell: pwgen -y -B -s 80 1
-  register: dbpassword
+  register: dbpassword.stdout
 
 - name: Install packages
   apt: pkg={{item}} state=installed update_cache=yes
diff --git a/roles/mail/templates/dovecot.conf b/roles/mail/templates/dovecot.conf
index 7b38fe8..d1d46c5 100644
--- a/roles/mail/templates/dovecot.conf
+++ b/roles/mail/templates/dovecot.conf
@@ -1,51 +1,43 @@
-## Dovecot configuration file
- 
-protocols = imap imaps pop3 pop3s managesieve
-log_timestamp = "%Y-%m-%d %H:%M:%S "
-mail_privileged_group = mail
- 
+# 2.1.7: /etc/dovecot/dovecot.conf
+# OS: Linux 3.2.0-4-amd64 x86_64 Debian 7.7 ext4
+!include conf.d/*.conf
 disable_plaintext_auth = no
+log_timestamp = "%Y-%m-%d %H:%M:%S "
 mail_location = maildir:/home/facteur/%d/%n:INDEX=/home/facteur/%d/%n/indexes
- 
-protocol imap {
-}
-protocol pop3 {
-}
-protocol managesieve {
-  listen = *:4190
-  login_executable = /usr/lib/dovecot/managesieve-login
-  mail_executable = /usr/lib/dovecot/managesieve
+mail_privileged_group = mail
+passdb {
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
 }
-protocol lda {
-  postmaster_address = admin@{{ domain }}
-  mail_plugin_dir = /usr/lib/dovecot/modules/lda
-  auth_socket_path = /var/run/dovecot/auth-master
-  mail_plugins = sieve quota
+plugin {
+  sieve = /home/facteur/%d/%n/.dovecot.sieve
+  sieve_dir = /home/facteur/%d/%n/sieve
 }
-auth default {
-        userdb sql {
-        args = /etc/dovecot/dovecot-mysql.conf
-        }
-        passdb sql {
-        args = /etc/dovecot/dovecot-mysql.conf
-        }
- socket listen {
-  master {
-  path = /var/run/dovecot/auth-master
-  mode = 0600
-  user = facteur
+protocols = imap pop3 sieve
+service auth {
+  unix_listener /var/spool/postfix/private/auth {
+    group = postfix
+    mode = 0660
+    user = postfix
   }
-  client {
-  path = /var/spool/postfix/private/auth
-  mode = 0660
-  user = postfix
-  group = postfix
+  unix_listener auth-master {
+    mode = 0600
+    user = facteur
   }
- }
 }
-dict {
+service managesieve-login {
+  executable = /usr/lib/dovecot/managesieve-login
 }
-plugin {
-  sieve_dir = /home/facteur/%d/%n/sieve
-  sieve = /home/facteur/%d/%n/.dovecot.sieve
+service managesieve {
+  executable = /usr/lib/dovecot/managesieve
+}
+userdb {
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
+}
+protocol lda {
+  auth_socket_path = /var/run/dovecot/auth-master
+  mail_plugin_dir = /usr/lib/dovecot/modules
+  mail_plugins = sieve quota
+  postmaster_address = admin@{{ domain }}
 }