Merge branch 'bottin2_upgrade' of Deuxfleurs/deuxfleurs.fr into master

2 files changed, 34 insertions, 15 deletions

diff --git a/nomad/bottin2.hcl b/nomad/bottin2.hcl
index 5a1fa12..6221d71 100644
--- a/nomad/bottin2.hcl
+++ b/nomad/bottin2.hcl
@@ -12,7 +12,7 @@ job "directory2" {
     task "bottin" {
       driver = "docker"
       config {
-        image = "lxpz/bottin_amd64:8"
+        image = "lxpz/bottin_amd64:10"
         readonly_rootfs = true
         port_map {
           ldap_port = 1389
@@ -61,7 +61,7 @@ job "directory2" {
     task "guichet" {
       driver = "docker"
       config {
-        image = "lxpz/guichet_amd64:2"
+        image = "lxpz/guichet_amd64:3"
         readonly_rootfs = true
         port_map {
           web_port = 9991
diff --git a/nomad/email.hcl b/nomad/email.hcl
index 1d5c8c1..d5cdc83 100644
--- a/nomad/email.hcl
+++ b/nomad/email.hcl
@@ -131,6 +131,17 @@ job "email" {
         }
       }
 
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/email/dovecot/dovecot-ldap.conf.tpl?raw"
+        destination = "secrets/conf/dovecot-ldap.conf.tpl"
+        mode = "file"
+      }
+      template {
+        source = "secrets/conf/dovecot-ldap.conf.tpl"
+        destination = "secrets/conf/dovecot-ldap.conf"
+        perms = "400"
+      }
+
       template {
         data = "{{ key \"configuration/email/dovecot/dovecot.crt\" }}"
         destination = "secrets/ssl/certs/dovecot.crt"
@@ -141,11 +152,6 @@ job "email" {
         destination = "secrets/ssl/private/dovecot.key"
         perms = "400"
       }
-      template {
-        data = "{{ key \"configuration/email/dovecot/dovecot-ldap.conf\" }}"
-        destination = "secrets/conf/dovecot-ldap.conf"
-        perms = "400"
-      }
     }
   }
 
@@ -328,6 +334,27 @@ job "email" {
         }
       }
 
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/email/postfix/ldap-account.cf.tpl?raw"
+        destination = "secrets/postfix/ldap-account.cf.tpl"
+        mode = "file"
+      }
+      template {
+        source = "secrets/postfix/ldap-account.cf.tpl"
+        destination = "secrets/postfix/ldap-account.cf"
+      }
+
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/email/postfix/ldap-alias.cf.tpl?raw"
+        destination = "secrets/postfix/ldap-alias.cf.tpl"
+        mode = "file"
+      }
+      template {
+        source = "secrets/postfix/ldap-alias.cf.tpl"
+        destination = "secrets/postfix/ldap-alias.cf"
+      }
+
+
       template {
         data = "{{ key \"configuration/email/postfix/postfix.crt\" }}"
         destination = "secrets/ssl/certs/postfix.crt"
@@ -347,14 +374,6 @@ job "email" {
         destination = "secrets/postfix/header_checks"
       }
       template {
-        data = "{{ key \"configuration/email/postfix/ldap-account.cf\" }}"
-        destination = "secrets/postfix/ldap-account.cf"
-      }
-      template {
-        data = "{{ key \"configuration/email/postfix/ldap-alias.cf\" }}"
-        destination = "secrets/postfix/ldap-alias.cf"
-      }
-      template {
         data = "{{ key \"configuration/email/postfix/main.cf\" }}"
         destination = "secrets/postfix/main.cf"
       }