Merge branch 'hotfix-0.2.2' into stable

Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia-baseimage
+FROM osixia/baseimage
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr>
 
 # From Nick Stenning's work

README.md

@@ -2,3 +2,30 @@
 
 Fork of Nick Stenning docker-slapd :
 https://github.com/nickstenning/docker-slapd
+
+Add support of tls.
+
+### How to use tls
+
+Add `-v some/host/dir:/etc/ldap/ssl` and `--dns=127.0.0.1` to the run command.
+
+`some/host/dir` must contain a least 3 files :
+- `ca.crt` certificate authority certificate
+- `ldap.crt` ldap server certificate
+- `ldap.key` ldap server certificate private key
+
+and optionaly `dhparam.pem` this file is genereted automaticaly if not present.
+
+`--dns=127.0.0.1` allow to use certificate cn correctly.
+
+
+### Example
+
+    docker run --dns=127.0.0.1 \
+               -v /data/ldap/db:/var/lib/ldap \
+               -v /data/ldap/ssl/:/etc/ldap/ssl \
+               -v /data/ldap/log/:/var/log \
+               -e LDAP_DOMAIN=example.com \
+               -e LDAP_ORGANISATION="Example Corp." \
+               -e LDAP_ROOTPASS=toor \
+               -p 389:389 -d osixia/openldap

slapd.sh

@@ -52,7 +52,7 @@ if [ -e /etc/ldap/ssl/ldap.crt ] && [ -e /etc/ldap/ssl/ldap.key ] && [ -e /etc/l
   # create DHParamFile if not found
   [ -f /etc/ldap/ssl/dhparam.pem ] || openssl dhparam -out /etc/ldap/ssl/dhparam.pem 2048
 
-  ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/ldap/config/auto/tls_add.ldif 
+  ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/ldap/config/auto/tls.ldif 
 
   # add fake dnsmasq route to certificate cn
   cn=$(openssl x509 -in /etc/ldap/ssl/ldap.crt -subject -noout | sed -n 's/.*CN=\(.*\).\^*/\1/p')