Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing ldap_ca_cert #1201

Merged
merged 4 commits into from
Sep 13, 2024
Merged

Add missing ldap_ca_cert #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7faaa66
Add missing ldap_ca_cert
winkingturtle-vmw Sep 6, 2024
83005fb
Add an example ca
winkingturtle-vmw Sep 9, 2024
56108f3
Rename variable as requested
winkingturtle-vmw Sep 9, 2024
f8c6bb2
{ldap_ca_cert,ldap_server_ssl}
winkingturtle-vmw Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions operations/enable-nfs-ldap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
- type: replace
path: /instance_groups/name=diego-cell/jobs/name=nfsv3driver/properties/nfsv3driver/allowed-in-source?
value: ""
- type: replace
path: /instance_groups/name=diego-cell/jobs/name=nfsv3driver/properties/nfsv3driver/ldap_ca_cert?
value: ((ldap_server_ssl.ca))
- type: replace
path: /instance_groups/name=nfs-broker-push/jobs/name=nfsbrokerpush/properties/nfsbrokerpush/ldap_enabled?
value: true
7 changes: 6 additions & 1 deletion operations/example-vars-files/vars-enable-nfs-ldap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ nfs-ldap-service-password: password
nfs-ldap-host: host
nfs-ldap-port: port
nfs-ldap-proto: proto
nfs-ldap-fqdn: fqdn
nfs-ldap-fqdn: fqdn
ldap_server_ssl:
ca: |
-----BEGIN CERTIFICATE-----
meow
-----END CERTIFICATE-----
10 changes: 5 additions & 5 deletions operations/test/enable-nfs-test-ldapserver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
ldap:
ssl:
active: true
ca_cert: ((ldap_test_server_ssl.ca))
server_cert: ((ldap_test_server_ssl.certificate))
server_key: ((ldap_test_server_ssl.private_key))
ca_cert: ((ldap_server_ssl.ca))
server_cert: ((ldap_server_ssl.certificate))
server_key: ((ldap_server_ssl.private_key))

- type: replace
path: /addons/name=bosh-dns-aliases/jobs/name=bosh-dns-aliases/properties/aliases/domain=nfstestldapserver.service.cf.internal?
Expand All @@ -24,7 +24,7 @@

- type: replace
path: /instance_groups/name=diego-cell/jobs/name=nfsv3driver/properties/nfsv3driver/ldap_ca_cert?
value: ((ldap_test_server_ssl.ca))
value: ((ldap_server_ssl.ca))

- type: replace
path: /variables/-
Expand All @@ -38,7 +38,7 @@
- type: replace
path: /variables/-
value:
name: ldap_test_server_ssl
name: ldap_server_ssl
type: certificate
update_mode: converge
options:
Expand Down