From 3534ba1a19844e55982cb773599671d2fdb4be02 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sun, 14 Jun 2020 11:48:53 +0200
Subject: [PATCH] Read domain name from LDAP

---
 .../email/postfix/ldap-virtual-domains.cf.tpl        | 12 ++++++++++++
 consul/configuration/email/postfix/main.cf           |  5 +----
 nomad/email.hcl                                      | 10 ++++++++++
 nomad/jitsi.hcl                                      |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl

diff --git a/consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl b/consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl
new file mode 100644
index 0000000..e013953
--- /dev/null
+++ b/consul/configuration/email/postfix/ldap-virtual-domains.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=domains,ou=groups,dc=deuxfleurs,dc=fr
+query_filter = (&(objectclass=dNSDomain)(domain=%s))
+result_attribute = domain
diff --git a/consul/configuration/email/postfix/main.cf b/consul/configuration/email/postfix/main.cf
index f121089..4204cb4 100644
--- a/consul/configuration/email/postfix/main.cf
+++ b/consul/configuration/email/postfix/main.cf
@@ -90,13 +90,10 @@ slow_destination_concurrency_limit = 2
 # Transport configuration
 #====
 transport_maps = hash:/etc/postfix/transport
-virtual_mailbox_domains = deuxfleurs.fr, dufour.io, dufour.tk
+virtual_mailbox_domains = ldap:/etc/postfix/ldap-virtual-domains.cf
 virtual_mailbox_maps = ldap:/etc/postfix/ldap-account.cf
-#virtual_alias_domains = deuxfleurs.fr, dufour.io, dufour.tk
 virtual_alias_maps = ldap:/etc/postfix/ldap-alias.cf
 virtual_transport = lmtp:dovecot-lmtp.service.2.cluster.deuxfleurs.fr:24
-#master_service_disable = 
-#tcp_windowsize = 1400
 
 #===
 # Mail filters
diff --git a/nomad/email.hcl b/nomad/email.hcl
index 75849cd..4b4be41 100644
--- a/nomad/email.hcl
+++ b/nomad/email.hcl
@@ -356,6 +356,16 @@ job "email" {
         destination = "secrets/postfix/ldap-alias.cf"
       }
 
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/email/postfix/ldap-virtual-domains.cf.tpl?raw"
+        destination = "secrets/postfix/ldap-virtual-domains.cf.tpl"
+        mode = "file"
+      }
+      template {
+        source = "secrets/postfix/ldap-virtual-domains.cf.tpl"
+        destination = "secrets/postfix/ldap-virtual-domains.cf"
+      }
+
 
       template {
         data = "{{ key \"configuration/email/postfix/postfix.crt\" }}"
diff --git a/nomad/jitsi.hcl b/nomad/jitsi.hcl
index 00d7767..4ef2f98 100644
--- a/nomad/jitsi.hcl
+++ b/nomad/jitsi.hcl
@@ -182,7 +182,7 @@ job "jitsi" {
 
       resources {
         cpu = 300
-        memory = 200
+        memory = 400
       } 
     }