Deuxfleurs/infrastructure
Archived
23
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

bottin2_upgrade #3

Manually merged
lx merged 6 commits from bottin2_upgrade into master 2020-02-11 22:35:54 +00:00
Conversation 0 Commits 6 Files changed 10 +14 -8
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cd6da5d52f - Show all commits

6
consul/configuration/email/dovecot/dovecot-ldap.conf.sample → consul/configuration/email/dovecot/dovecot-ldap.conf.tpl
View file

@ -1,6 +1,6 @@
hosts = bottin.service.2.cluster.deuxfleurs.fr
dn = cn=<username>,dc=deuxfleurs,dc=fr
dnpass = <password>
hosts = bottin2.service.2.cluster.deuxfleurs.fr
dn = {{ key "secrets/email/dovecot/ldap_binddn" | trimSpace }}
dnpass = {{ key "secrets/email/dovecot/ldap_bindpwd" | trimSpace }}
base = dc=deuxfleurs,dc=fr
scope = subtree
user_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr)))

16
nomad/email.hcl
View file

@ -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"
}
}
}