ofreax 10 years ago
parent
commit
e91d82ec3f
3 changed files with 10 additions and 7 deletions
  1. 3 0
      CHANGELOG.md
  2. 4 4
      image/env.yaml
  3. 3 3
      image/service/slapd/container-start.sh

+ 3 - 0
CHANGELOG.md

@@ -4,6 +4,9 @@
   - Upgrade baseimage: osixia/light-baseimage:0.1.1
   - Rename environment variables
 
+  - Fixes :
+    - OpenLdap container won't start when dhparam.pem is missing in bound volume #13
+
 ## 1.0.0
   - Use light-baseimage
   - Improve documentation

+ 4 - 4
image/env.yaml

@@ -1,20 +1,20 @@
-# general container configuration
+# General container configuration
 # see table 5.1 in http://www.openldap.org/doc/admin24/slapdconf2.html for the available log levels.
 LDAP_LOG_LEVEL: 256
 
-# required and used for new ldap server only
+# Required and used for new ldap server only
 LDAP_ORGANISATION: Example Inc.
 LDAP_DOMAIN: example.org
 LDAP_ADMIN_PASSWORD: admin
 LDAP_CONFIG_PASSWORD: config
 
-# tls
+# Tls
 LDAP_TLS: true
 LDAP_TLS_CRT_FILENAME: ldap.crt
 LDAP_TLS_KEY_FILENAME: ldap.key
 LDAP_TLS_CA_CRT_FILENAME: ca.crt
 
-# replication
+# Replication
 LDAP_REPLICATION: false
 # variables $LDAP_BASE_DN, $LDAP_ADMIN_PASSWORD, $LDAP_CONFIG_PASSWORD
 # are automaticaly replaced at run time

+ 3 - 3
image/service/slapd/container-start.sh

@@ -9,7 +9,7 @@ WAS_STARTED_WITH_REPLICATION="/etc/ldap/slapd.d/docker-openldap-was-started-with
 # see https://github.com/docker/docker/issues/8231
 ulimit -n 1024
 
-#fix file permissions
+# fix file permissions
 chown -R openldap:openldap /var/lib/ldap
 chown -R openldap:openldap /etc/ldap
 chown -R openldap:openldap /container/service/slapd
@@ -150,7 +150,7 @@ EOF
 
   fi
 
-  # TLS config
+  # tls config
   if [ "${LDAP_TLS,,}" == "true" ]; then
 
     echo "Use TLS"
@@ -203,7 +203,7 @@ EOF
       for host in "${LDAP_REPLICATION_HOSTS[@]}"
       do
 
-        #host var contain a variable name, we access to the variable value
+        # host var contain a variable name, we access to the variable value
         host=${!host}
 
         sed -i "s|{{ LDAP_REPLICATION_HOSTS }}|olcServerID: $i ${host}\n{{ LDAP_REPLICATION_HOSTS }}|g" /container/service/slapd/assets/config/replication/replication-enable.ldif