From 942a3d67249bbb288762b653940c597f974153a3 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Tue, 23 Feb 2016 14:57:53 +0100
Subject: [PATCH] Fix LDAP for mail role.

Missing postfix-ldap, use uri instead of host.
---
 roles/mail/tasks/main.yml                            | 1 +
 roles/mail/templates/postfix/ldap-aliases.cf.j2      | 3 +--
 roles/mail/templates/postfix/ldap-virtual-maps.cf.j2 | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 0d8fa4a..e54c659 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -11,6 +11,7 @@
   - dovecot-managesieved
   - dovecot-sieve
   - postfix
+  - postfix-ldap
   - postfix-policyd-spf-python
   - postgrey
   - pyzor
diff --git a/roles/mail/templates/postfix/ldap-aliases.cf.j2 b/roles/mail/templates/postfix/ldap-aliases.cf.j2
index 9c9120c..696ef38 100644
--- a/roles/mail/templates/postfix/ldap-aliases.cf.j2
+++ b/roles/mail/templates/postfix/ldap-aliases.cf.j2
@@ -1,5 +1,4 @@
-server_host = {{ ldap_host }}
-start_tls = yes
+server_host = {{ ldap_uri }}
 #tls_ca_cert_file = TODO
 #tls_require_cert = yes
 bind = yes
diff --git a/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2 b/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
index d6f46a1..b648fc1 100644
--- a/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
+++ b/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
@@ -1,5 +1,4 @@
-server_host = {{ ldap_host }}
-start_tls = yes
+server_host = {{ ldap_uri }}
 #tls_ca_cert_file = TODO
 #tls_require_cert = yes
 bind = yes