From 5606ef1938300235d9a2fc2c44009d8badd94898 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hi-media.com>
Date: Tue, 17 Jun 2014 09:28:20 +0200
Subject: [PATCH 1/2] [twgit] Init hotfix 'hotfix-0.6.2'.


From c32c1683edd0bc998b2456183ce1b6e673152a60 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hi-media.com>
Date: Tue, 17 Jun 2014 09:43:13 +0200
Subject: [PATCH 2/2] reorganisation code

---
 Dockerfile                                     | 12 +++++++-----
 {config => service/slapd/config}/auto/tls.ldif |  0
 {config => service/slapd/config}/logging.ldif  |  0
 slapd.sh => service/slapd/slapd.sh             |  0
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename {config => service/slapd/config}/auto/tls.ldif (100%)
 rename {config => service/slapd/config}/logging.ldif (100%)
 rename slapd.sh => service/slapd/slapd.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index 187538d..9b4379e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,11 +9,13 @@ ENV LDAP_ADMIN_PWD toor
 ENV LDAP_ORGANISATION Example Inc.
 ENV LDAP_DOMAIN example.com
 
-# /!\ To store the data outside the container, mount /var/lib/ldap as a data volume
-# add -v /some/host/directory:/var/lib/ldap to the run command
+# /!\ To store the data outside the container, 
+# mount /var/lib/ldap and /etc/ldap/slapd.d as a data volume add
+# -v /some/host/directory:/var/lib/ldap and -v /some/other/host/directory:/etc/ldap/slapd.d
+# to the run command
 
 # Disable SSH
-RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
+# RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
 
 # Enable dnsmasq
 RUN /etc/enable-service dnsmasq
@@ -35,11 +37,11 @@ RUN mkdir /etc/ldap/ssl
 
 # Add config directory 
 RUN mkdir /etc/ldap/config
-ADD config /etc/ldap/config
+ADD service/slapd/config /etc/ldap/config
 
 # Add slapd deamon
 RUN mkdir /etc/service/slapd
-ADD slapd.sh /etc/service/slapd/run
+ADD service/slapd/slapd.sh /etc/service/slapd/run
 
 # Clear out the local repository of retrieved package files
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/config/auto/tls.ldif b/service/slapd/config/auto/tls.ldif
similarity index 100%
rename from config/auto/tls.ldif
rename to service/slapd/config/auto/tls.ldif
diff --git a/config/logging.ldif b/service/slapd/config/logging.ldif
similarity index 100%
rename from config/logging.ldif
rename to service/slapd/config/logging.ldif
diff --git a/slapd.sh b/service/slapd/slapd.sh
similarity index 100%
rename from slapd.sh
rename to service/slapd/slapd.sh