Skip to content

Commit 80b9afb

Browse files
committed
Merge branch 'timgates42-bugfix_typos' into release-1.5.0
2 parents c00a02d + 9cb2413 commit 80b9afb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Do not edit slapd.conf it's not used. To modify your server configuration use ld
153153
#### Seed ldap database with ldif
154154

155155
This image can load ldif files at startup with either `ldapadd` or `ldapmodify`.
156-
Mount `.ldif` in `/container/service/slapd/assets/config/bootstrap/ldif` directory if you want to overwrite image default boostrap ldif files or in `/container/service/slapd/assets/config/bootstrap/ldif/custom` (recommended) to extend image config.
156+
Mount `.ldif` in `/container/service/slapd/assets/config/bootstrap/ldif` directory if you want to overwrite image default bootstrap ldif files or in `/container/service/slapd/assets/config/bootstrap/ldif/custom` (recommended) to extend image config.
157157

158158
Files containing `changeType:` attributes will be loaded with `ldapmodify`.
159159

@@ -401,7 +401,7 @@ Replication options:
401401
Other environment variables:
402402
- **KEEP_EXISTING_CONFIG**: Do not change the ldap config. Defaults to `false`
403403
- if set to *true* with an existing database, config will remain unchanged. Image tls and replication config will not be run. The container can be started with LDAP_ADMIN_PASSWORD and LDAP_CONFIG_PASSWORD empty or filled with fake data.
404-
- if set to *true* when bootstrapping a new database, bootstap ldif and schema will not be added and tls and replication config will not be run.
404+
- if set to *true* when bootstrapping a new database, bootstrap ldif and schema will not be added and tls and replication config will not be run.
405405

406406
- **LDAP_REMOVE_CONFIG_AFTER_SETUP**: delete config folder after setup. Defaults to `true`
407407
- **LDAP_SSL_HELPER_PREFIX**: ssl-helper environment variables prefix. Defaults to `ldap`, ssl-helper first search config from LDAP_SSL_HELPER_* variables, before SSL_HELPER_* variables.

example/kubernetes/using-secrets/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ https://github.com/jp-gouin/helm-openldap.git
1212

1313
`make example`
1414

15-
Then edit the yaml files in the environment directory to have the desired paraneters, and then make the secret file:
15+
Then edit the yaml files in the environment directory to have the desired parameters, and then make the secret file:
1616

1717
`make ldap-secret.yaml`
1818

0 commit comments

Comments
 (0)