commit 4e2289093ebffb658121be4bca062acec1300af2
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Mar 05 10:54:37 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Mar 05 10:54:37 2019 +0000
tree 6810ea1e3d5706b7d96af48b96a97d55e8c4ece2
parent 1926647517d35e668c9213707ebd2211ec86df35
parent a5e8d5c196195969e2ccd7167cf440ea6796552b

Merge "Fix issue with unencrypted openldap admin password" into release/2019.2.0

docker/swarm/stack/ldap.yml

diff --git a/docker/swarm/stack/ldap.yml b/docker/swarm/stack/ldap.yml
index fbb74bc..b785711 100644
--- a/docker/swarm/stack/ldap.yml
+++ b/docker/swarm/stack/ldap.yml
@@ -39,7 +39,8 @@
                 - server
               hostname: ldap
               environment:
-                PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'server': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '${_param:openldap_admin_password}'}]}]}]"
+                PHPLDAPADMIN_LDAP_ADMIN_PASSWORD: ${_param:openldap_admin_password}
+                PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'server': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '$PHPLDAPADMIN_LDAP_ADMIN_PASSWORD'}]}]}]"
                 PHPLDAPADMIN_HTTPS: "false"
                 PHPLDAPADMIN_TRUST_PROXY_SSL: "true"
                 PHPLDAPADMIN_SERVER_ADMIN: ${_param:admin_email}