From a552f67e9433a476c49db0b7166538f1d3d68f47 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 11 Feb 2020 22:24:42 +0100
Subject: WIP (not tested) switch Postfix to bottin2 and use separate secrets

---
 consul/configuration/email/postfix/ldap-account.cf.sample | 12 ------------
 consul/configuration/email/postfix/ldap-account.cf.tpl    | 12 ++++++++++++
 consul/configuration/email/postfix/ldap-alias.cf.sample   |  9 ---------
 consul/configuration/email/postfix/ldap-alias.cf.tpl      |  9 +++++++++
 4 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 consul/configuration/email/postfix/ldap-account.cf.sample
 create mode 100644 consul/configuration/email/postfix/ldap-account.cf.tpl
 delete mode 100644 consul/configuration/email/postfix/ldap-alias.cf.sample
 create mode 100644 consul/configuration/email/postfix/ldap-alias.cf.tpl

(limited to 'consul/configuration')

diff --git a/consul/configuration/email/postfix/ldap-account.cf.sample b/consul/configuration/email/postfix/ldap-account.cf.sample
deleted file mode 100644
index 1b90252..0000000
--- a/consul/configuration/email/postfix/ldap-account.cf.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-bind = yes
-bind_dn = cn=<user>,dc=deuxfleurs,dc=fr
-bind_pw = <secret>
-version = 3
-timeout = 20
-start_tls = no
-tls_require_cert = no
-server_host = ldap://bottin.service.2.cluster.deuxfleurs.fr
-scope = sub
-search_base = ou=users,dc=deuxfleurs,dc=fr
-query_filter = mail=%s
-result_attribute = mail
diff --git a/consul/configuration/email/postfix/ldap-account.cf.tpl b/consul/configuration/email/postfix/ldap-account.cf.tpl
new file mode 100644
index 0000000..2575f10
--- /dev/null
+++ b/consul/configuration/email/postfix/ldap-account.cf.tpl
@@ -0,0 +1,12 @@
+bind = yes
+bind_dn = {{ key "secrets/email/postfix/ldap_binddn" | trimSpace }}
+bind_pw = {{ key "secrets/email/postfix/ldap_bindpwd" | trimSpace }}
+version = 3
+timeout = 20
+start_tls = no
+tls_require_cert = no
+server_host = ldap://bottin2.service.2.cluster.deuxfleurs.fr
+scope = sub
+search_base = ou=users,dc=deuxfleurs,dc=fr
+query_filter = mail=%s
+result_attribute = mail
diff --git a/consul/configuration/email/postfix/ldap-alias.cf.sample b/consul/configuration/email/postfix/ldap-alias.cf.sample
deleted file mode 100644
index 8ed3361..0000000
--- a/consul/configuration/email/postfix/ldap-alias.cf.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-server_host = bottin.service.2.cluster.deuxfleurs.fr
-server_port = 389
-search_base = dc=deuxfleurs,dc=fr
-query_filter = (&(objectClass=inetOrgPerson)(memberOf=cn=%s,ou=mailing_lists,ou=groups,dc=deuxfleurs,dc=fr))
-result_attribute = mail
-bind = yes
-bind_dn = cn=<someone>,dc=deuxfleurs,dc=fr
-bind_pw = <password>
-version = 3
diff --git a/consul/configuration/email/postfix/ldap-alias.cf.tpl b/consul/configuration/email/postfix/ldap-alias.cf.tpl
new file mode 100644
index 0000000..775c0ad
--- /dev/null
+++ b/consul/configuration/email/postfix/ldap-alias.cf.tpl
@@ -0,0 +1,9 @@
+server_host = bottin2.service.2.cluster.deuxfleurs.fr
+server_port = 389
+search_base = dc=deuxfleurs,dc=fr
+query_filter = (&(objectClass=inetOrgPerson)(memberOf=cn=%s,ou=mailing_lists,ou=groups,dc=deuxfleurs,dc=fr))
+result_attribute = mail
+bind = yes
+bind_dn = {{ key "secrets/email/postfix/ldap_binddn" | trimSpace }}
+bind_pw = {{ key "secrets/email/postfix/ldap_bindpwd" | trimSpace }}
+version = 3
-- 
cgit v1.2.3