Skip to content

Commit d5aa48b

Browse files
committed
add LDAP_CFSSL_PREFIX
1 parent 5722a58 commit d5aa48b

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Replication options:
250250
- ldap://ldap.example.org
251251
- ldap://ldap2.example.org
252252
```
253-
253+
254254
If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
255255

256256
docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach osixia/openldap:1.1.0
@@ -259,6 +259,7 @@ Replication options:
259259

260260
Other environment variables:
261261
- **LDAP_REMOVE_CONFIG_AFTER_SETUP**: delete config folder after setup. Defaults to `true`
262+
- **LDAP_CFSSL_PREFIX**: cfssl environment variables prefix. Defaults to `ldap`, cfssl-helper first search config from LDAP_CFSSL_* variables, before CFSSL_* variables.
262263

263264

264265
### Set your own environment variables

image/environment/default.yaml.startup

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ LDAP_REPLICATION_HOSTS:
4444

4545
# Remove config after setup
4646
LDAP_REMOVE_CONFIG_AFTER_SETUP: true
47+
48+
# cfssl environment variables prefix
49+
LDAP_CFSSL_PREFIX: ldap # cfssl-helper first search config from LDAP_CFSSL_* variables, before CFSSL_* variables.

image/service/slapd/startup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
5757

5858
# generate a certificate and key with cfssl tool if LDAP_CRT and LDAP_KEY files don't exists
5959
# https://github.com/osixia/docker-light-baseimage/blob/stable/image/service-available/:cfssl/assets/tool/cfssl-helper
60-
cfssl-helper ldap $LDAP_CRT $LDAP_KEY $CA_CRT
60+
cfssl-helper $LDAP_CFSSL_PREFIX $LDAP_CRT $LDAP_KEY $CA_CRT
6161

6262
# create DHParamFile if not found
6363
[ -f ${DH_PARAM} ] || openssl dhparam -out ${DH_PARAM} 2048

0 commit comments

Comments
 (0)