From ad1de4a196c42cf8c9fcb995a297fe4a41d61668 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <admin@example.com>
Date: Thu, 6 Nov 2014 18:22:18 +0100
Subject: [PATCH] files

---
 Dockerfile             |  2 +-
 service/slapd/slapd.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 26fbd97..14266e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ VOLUME ["/var/lib/ldap", "/etc/ldap/slapd.d"]
 # RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
 
 # Enable dnsmasq
-RUN /sbin/enable-service dnsmasq
+RUN /sbin/enable-service dnsmasq ca-authority
 
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
diff --git a/service/slapd/slapd.sh b/service/slapd/slapd.sh
index 7ed8e06..8a4eda5 100755
--- a/service/slapd/slapd.sh
+++ b/service/slapd/slapd.sh
@@ -77,16 +77,16 @@ if [ ! -e /etc/ldap/slapd.d/docker_bootstrapped ]; then
   else
 
     #generate default tls certificates / set domain name
-    DOMAIN_ESC=`echo $DOMAIN_NAME | sed 's/\./_/g'`
-    DOMAIN_ESC_UPPER=`echo $DOMAIN_ESC | tr '[a-z]' '[A-Z]'`
-    export SSL_${DOMAIN_ESC_UPPER}_COMMON_NAME=${DOMAIN_NAME}
-    export SSL_${DOMAIN_ESC_UPPER}_ORGANIZATION="${LDAP_ORGANISATION}"
+    export SSL_SLAPD_COMMON_NAME="$DOMAIN_NAME"
+    export SSL_SLAPD_ORGANIZATION="${LDAP_ORGANISATION}"
 
-    /sbin/create-ssl-cert $DOMAIN_NAME /etc/ldap/ssl/ldap.crt /etc/ldap/ssl/ldap.key
-    cp /etc/ldap/ssl/ldap.crt /etc/ldap/ssl/ca.crt
+    /sbin/ssl-create-cert slapd /etc/ldap/ssl/ldap.crt /etc/ldap/ssl/ldap.key
+    ln -s /etc/ssl/certs/docker_baseimage_cacert.pem /etc/ldap/ssl/ca.crt
 
   fi
 
+  sed -i 's,TLS_CACERT.*,TLS_CACERT ./etc/ldap/ssl/ca.crt,g' /etc/ldap/ldap.conf
+
   # Fix permission on certificates
   chown openldap:openldap -R /etc/ldap/ssl