Merge branch 'hotfix-0.6.1' into stable

Dockerfile

@@ -15,6 +15,9 @@ ENV LDAP_DOMAIN example.com
 # Disable SSH
 RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
 
+# Enable dnsmasq
+RUN /etc/enable-service dnsmasq
+
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
 

README.md

@@ -23,6 +23,7 @@ and optionaly `dhparam.pem` this file is genereted automaticaly if not present.
 
     docker run --dns=127.0.0.1 \
                -v /data/ldap/db:/var/lib/ldap \
+               -v /data/ldap/config:/etc/ldap/slapd.d \
                -v /data/ldap/ssl/:/etc/ldap/ssl \
                -v /data/ldap/log/:/var/log \
                -e LDAP_DOMAIN=example.com \

slapd.sh

@@ -46,10 +46,7 @@ fi
 if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
   status "Custom config"
 
-  # permission error on /etc/ldap/slapd.conf if not set?! :'(
-  adduser openldap root
-
-  slapd -h "ldap:/// ldapi:///" -u openldap -g openldap 
+  slapd -h "ldapi:///" -u openldap -g openldap 
   chown -R openldap:openldap /etc/ldap
 
   # TLS

test.sh

@@ -46,8 +46,9 @@ run_test () {
 
 ./test/tools/prepare.sh > /dev/null 2>&1
 run_test build "Successfully built"
-run_test run-simple "dn: dc=example,dc=com"
-run_test run-tls "dn: dc=example,dc=com"
+run_test simple "dn: dc=example,dc=com"
+run_test tls "dn: dc=example,dc=com"
+run_test db "dn: dc=otherdomain,dc=com"
 ./test/tools/end.sh > /dev/null 2>&1
 
 echo "------- Test finished -------"

test/build.sh

@@ -3,6 +3,6 @@
 dir=$(dirname $0)
 . $dir/tools/config.prop
 
-sudo docker.io build -t $openldapTestImage .
-#sudo docker.io build --no-cache=true -t openldap-test .
+docker.io build -t $openldapTestImage .
+#docker.io build --no-cache=true -t $openldapTestImage .
 

test/db.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+if [ -d "$openldapTestDir" ]; then
+  rm -r $openldapTestDir
+fi
+
+mkdir $openldapTestDir
+mkdir $openldapTestDir/db
+mkdir $openldapTestDir/config
+
+runOptions="-e LDAP_DOMAIN=otherdomain.com -v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
+. $dir/tools/run-simple.sh
+$dir/tools/delete-container.sh
+
+runOptions="-v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
+. $dir/tools/run-simple.sh
+echo "ldapsearch -x -h $IP -b dc=otherdomain,dc=com"
+ldapsearch -x -h $IP -b dc=otherdomain,dc=com
+
+rm -r $openldapTestDir
+$dir/tools/delete-container.sh

test/run-simple.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-dir=$(dirname $0)
-. $dir/tools/config.prop
-
-docker.io run --name $openldapTestContainer -p 65389:389 -d $openldapTestImage
-sleep 5
-ldapsearch -x -h localhost -p 65389 -b dc=example,dc=com
-
-$dir/tools/delete-container.sh

test/run-tls.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-dir=$(dirname $0)
-. $dir/tools/config.prop
-
-docker.io run  --name $openldapTestContainer --dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl -p 65389:389 -d $openldapTestImage
-
-cert=$(echo $dir/ssl/ldap.crt)
-certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
-addLine=$(echo "127.0.0.1" $certCN)
-
-echo $addLine >> /etc/hosts
-cp /etc/ldap/ldap.conf /etc/ldap/ldap.conf.old
-sed -i 's,TLS_CACERT.*,TLS_CACERT '"$cert"',g' /etc/ldap/ldap.conf
-
-
-sleep 5
-ldapsearch -x -h $certCN -p 65389 -b dc=example,dc=com -ZZ
-
-sed -i '/'"$addLine"'/d' /etc/hosts
-cp /etc/ldap/ldap.conf.old /etc/ldap/ldap.conf
-rm /etc/ldap/ldap.conf.old
-
-$dir/tools/delete-container.sh

test/simple.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+. $dir/tools/run-simple.sh
+echo "ldapsearch -x -h $IP -b dc=example,dc=com"
+ldapsearch -x -h $IP -b dc=example,dc=com
+
+$dir/tools/delete-container.sh

test/tls.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+. $dir/tools/run-tls.sh
+echo "ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ"
+ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ
+
+. $dir/tools/end-tls.sh

test/tools/config.prop

@@ -1,2 +1,3 @@
 openldapTestImage=openldap-test
 openldapTestContainer=openldap-test-container
+openldapTestDir=/osixia-test-docker-openldap

test/tools/delete-container.sh

@@ -6,6 +6,6 @@
 res=$(docker.io ps -a | grep -c "$openldapTestContainer")
 
 if [ $res -ne 0 ]; then
-  docker.io stop openldap-test-container
-  docker.io rm openldap-test-container
+  docker.io stop $openldapTestContainer
+  docker.io rm $openldapTestContainer
 fi

test/tools/delete-image.sh

@@ -6,5 +6,5 @@
 res=$(docker.io images | grep -c "$openldapTestImage")
 
 if [ $res -ne 0 ]; then
-  docker.io rmi openldap-test
+  docker.io rmi $openldapTestImage
 fi

test/tools/end-tls.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+sed -i '/'"$addLine"'/d' /etc/hosts
+cp /etc/ldap/ldap.conf.old /etc/ldap/ldap.conf
+rm /etc/ldap/ldap.conf.old
+
+$dir/tools/delete-container.sh

test/tools/end.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
-$(dirname $0)/delete-container.sh
-$(dirname $0)/delete-image.sh
+dir=$(dirname $0)
+$dir/delete-container.sh
+$dir/delete-image.sh

test/tools/prepare.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
-$(dirname $0)/delete-container.sh
-$(dirname $0)/delete-image.sh
+dir=$(dirname $0)
+$dir/delete-container.sh
+$dir/delete-image.sh

test/tools/run-simple.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage"
+ID=`docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage`
+sleep 5
+
+echo " --> Obtaining IP"
+IP=`docker inspect $ID | grep IPAddress | sed -e 's/.*: "//; s/".*//'`
+if [ "$IP" = "" ]; then
+	abort "Unable to obtain container IP"
+	exit 1
+else
+  echo " -->" $IP
+fi

test/tools/run-tls.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+
+runOptions="--dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl"
+. $dir/tools/run-simple.sh
+
+cert=$(echo $dir/ssl/ldap.crt)
+certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
+addLine=$(echo $IP $certCN)
+
+echo $addLine >> /etc/hosts
+cp /etc/ldap/ldap.conf /etc/ldap/ldap.conf.old
+sed -i 's,TLS_CACERT.*,TLS_CACERT '"$cert"',g' /etc/ldap/ldap.conf
+
+sleep 5
+