Merge branch 'release-0.6.0' 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
 
+# DIsable nginx and php
+RUN rm -rf /etc/service/nginx /etc/service/php5-fpm
+
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
 

slapd.sh

@@ -46,9 +46,6 @@ 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 "ldapi:///" -u openldap -g openldap 
   chown -R openldap:openldap /etc/ldap