Merge branch 'hotfix-0.10.1' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -1,2 +1,8 @@
+## 0.10.1 (release date: 2015-05-17)
+  - Add ldapi
+  - Add custom ldap schema
+  - Auto convert .schema to .ldif
+  - Fixes issues #2 #3
+
 ## 0.10.0 (release date: 2015-03-03)
-  - New version initial release
+  - New version initial release

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 0.10.0
+VERSION = 0.10.1
 
 .PHONY: all build test tag_latest release
 

README.md

@@ -27,7 +27,7 @@ make sure to replace `CONTAINER_ID` by your container id :
 You should now be in the container terminal, 
 and we can search on the ldap server :
 
-	ldapsearch -x -h 127.0.0.1 -b dc=example,dc=org
+	ldapsearch -x -h 127.0.0.1 -b dc=example,dc=org -D "cn=admin,dc=example,dc=org" -w admin
 
 This should output :
 
@@ -65,7 +65,7 @@ By default the admin has the password **admin**. All those default settings can
 
 The directories `/var/lib/ldap` (LDAP database files) and `/etc/ldap/slapd.d`  (LDAP config files) has been declared as volumes, so your ldap files are saved outside the container in data volumes.
 
-This mean that you can stop, and restart the container and get back your ldap without losing any data. But if you remove the container, data volumes will me removed too, except if you have linked this data volume to an other container.
+Be careful, if you remove the container, data volumes will me removed too, except if you have linked this data volume to an other container.
 
 For more information about docker data volume, please refer to :
 

image/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/baseimage:0.10.3
+FROM osixia/baseimage:0.10.4
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Use baseimage-docker's init system.

image/service/slapd/assets/schema-to-ldif.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+SCHEMAS=$1
+
+tmpd=`mktemp -d`
+pushd ${tmpd} >>/dev/null
+
+echo "include /etc/ldap/schema/core.schema" >> convert.dat
+echo "include /etc/ldap/schema/cosine.schema" >> convert.dat
+echo "include /etc/ldap/schema/nis.schema" >> convert.dat
+echo "include /etc/ldap/schema/inetorgperson.schema" >> convert.dat
+
+for schema in ${SCHEMAS} ; do
+    echo "include ${schema}" >> convert.dat
+done
+
+slaptest -f convert.dat -F .
+
+if [ $? -ne 0 ] ; then
+    echo "slaptest conversion failed"
+    exit 
+fi
+
+for schema in ${SCHEMAS} ; do
+    fullpath=${schema}
+    schema_name=`basename ${fullpath} .schema`
+    schema_dir=`dirname ${fullpath}`
+    ldif_file=${schema_name}.ldif
+
+    find . -name *${schema_name}.ldif -exec mv '{}' ./${ldif_file} \;
+
+    # TODO: these sed invocations could all be combined
+    sed -i "/dn:/ c dn: cn=${schema_name},cn=schema,cn=config" ${ldif_file}
+    sed -i "/cn:/ c cn: ${schema_name}" ${ldif_file}
+    sed -i '/structuralObjectClass/ d' ${ldif_file}
+    sed -i '/entryUUID/ d' ${ldif_file}
+    sed -i '/creatorsName/ d' ${ldif_file}
+    sed -i '/createTimestamp/ d' ${ldif_file}
+    sed -i '/entryCSN/ d' ${ldif_file}
+    sed -i '/modifiersName/ d' ${ldif_file}
+    sed -i '/modifyTimestamp/ d' ${ldif_file}
+    
+    # slapd seems to be very sensitive to how a file ends. There should be no blank lines.
+    sed -i '/^ *$/d' ${ldif_file}
+
+    mv ${ldif_file} ${schema_dir}
+done
+
+popd >>/dev/null
+rm -rf $tmpd

image/service/slapd/assets/schema/mmc/README.md

@@ -0,0 +1 @@
+Mandriva Management Console (MMC) ldap schemas, delete the forlder if not needed ;)