diff options
| author | Alex <alex@adnab.me> | 2020-02-11 23:35:53 +0100 |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2020-02-11 23:35:53 +0100 |
| commit | 9e5839765a5578fb3ca63fbe55eeba96c14969b6 (patch) | |
| tree | 1a2b518ccd68cdd0fe2530041b28bfc910760eb0 /nomad/email.hcl | |
| parent | 535d1c3aba902ec644387cb41fc7cc0bcf86fae0 (diff) | |
| parent | 91032944ee47ed6b6eeb674266ec64bedeac37b7 (diff) | |
| download | infrastructure-9e5839765a5578fb3ca63fbe55eeba96c14969b6.tar.gz infrastructure-9e5839765a5578fb3ca63fbe55eeba96c14969b6.zip | |
Merge branch 'bottin2_upgrade' of Deuxfleurs/deuxfleurs.fr into master
Diffstat (limited to 'nomad/email.hcl')
| -rw-r--r-- | nomad/email.hcl | 45 |
1 files changed, 32 insertions, 13 deletions
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" } |