Skip to content

Commit e91d82e

Browse files
committed
-
1 parent 396ac9b commit e91d82e

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
- Upgrade baseimage: osixia/light-baseimage:0.1.1
55
- Rename environment variables
66

7+
- Fixes :
8+
- OpenLdap container won't start when dhparam.pem is missing in bound volume #13
9+
710
## 1.0.0
811
- Use light-baseimage
912
- Improve documentation

image/env.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# general container configuration
1+
# General container configuration
22
# see table 5.1 in http://www.openldap.org/doc/admin24/slapdconf2.html for the available log levels.
33
LDAP_LOG_LEVEL: 256
44

5-
# required and used for new ldap server only
5+
# Required and used for new ldap server only
66
LDAP_ORGANISATION: Example Inc.
77
LDAP_DOMAIN: example.org
88
LDAP_ADMIN_PASSWORD: admin
99
LDAP_CONFIG_PASSWORD: config
1010

11-
# tls
11+
# Tls
1212
LDAP_TLS: true
1313
LDAP_TLS_CRT_FILENAME: ldap.crt
1414
LDAP_TLS_KEY_FILENAME: ldap.key
1515
LDAP_TLS_CA_CRT_FILENAME: ca.crt
1616

17-
# replication
17+
# Replication
1818
LDAP_REPLICATION: false
1919
# variables $LDAP_BASE_DN, $LDAP_ADMIN_PASSWORD, $LDAP_CONFIG_PASSWORD
2020
# are automaticaly replaced at run time

image/service/slapd/container-start.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WAS_STARTED_WITH_REPLICATION="/etc/ldap/slapd.d/docker-openldap-was-started-with
99
# see https://github.com/docker/docker/issues/8231
1010
ulimit -n 1024
1111

12-
#fix file permissions
12+
# fix file permissions
1313
chown -R openldap:openldap /var/lib/ldap
1414
chown -R openldap:openldap /etc/ldap
1515
chown -R openldap:openldap /container/service/slapd
@@ -150,7 +150,7 @@ EOF
150150

151151
fi
152152

153-
# TLS config
153+
# tls config
154154
if [ "${LDAP_TLS,,}" == "true" ]; then
155155

156156
echo "Use TLS"
@@ -203,7 +203,7 @@ EOF
203203
for host in "${LDAP_REPLICATION_HOSTS[@]}"
204204
do
205205

206-
#host var contain a variable name, we access to the variable value
206+
# host var contain a variable name, we access to the variable value
207207
host=${!host}
208208

209209
sed -i "s|{{ LDAP_REPLICATION_HOSTS }}|olcServerID: $i ${host}\n{{ LDAP_REPLICATION_HOSTS }}|g" /container/service/slapd/assets/config/replication/replication-enable.ldif

0 commit comments

Comments
 (0)