Merge "add cert for radosgw"
diff --git a/kubernetes/control/services/drivetrain/ldap.yml b/kubernetes/control/services/drivetrain/ldap.yml
index 5a7c317..7c8800e 100644
--- a/kubernetes/control/services/drivetrain/ldap.yml
+++ b/kubernetes/control/services/drivetrain/ldap.yml
@@ -79,8 +79,10 @@
image: ${_param:docker_image_phpldapadmin}
image_pull_policy: IfNotPresent
variables:
+ - name: PHPLDAPADMIN_LDAP_ADMIN_PASSWORD
+ value: ${_param:openldap_admin_password}
- name: PHPLDAPADMIN_LDAP_HOSTS
- value: "#PYTHON2BASH:[{'server': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '${_param:openldap_admin_password}'}]}]}]"
+ value: "#PYTHON2BASH:[{'server': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '$PHPLDAPADMIN_LDAP_ADMIN_PASSWORD'}]}]}]"
- name: PHPLDAPADMIN_HTTPS
value: "'false'"
- name: PHPLDAPADMIN_TRUST_PROXY_SSL
@@ -104,4 +106,4 @@
type: glusterfs
endpoints: glusterfs
path: openldap-data
- read_only: false
\ No newline at end of file
+ read_only: false
diff --git a/nginx/server/proxy/ssl.yml b/nginx/server/proxy/ssl.yml
index dd4f2cd..fdd95a5 100644
--- a/nginx/server/proxy/ssl.yml
+++ b/nginx/server/proxy/ssl.yml
@@ -8,10 +8,6 @@
dhparam:
enabled: True
numbits: 2048
- ecdh_curve:
- secp521r1:
- name: 'secp521r1'
- enabled: True
prefer_server_ciphers: "on"
protocols:
TLSv1: