From 60293c62cb5d16c18dfd82e5a4d7172aafa1a3b4 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bertrand.gouny@osixia.fr>
Date: Wed, 7 May 2014 23:25:52 +0200
Subject: [PATCH 1/3] [twgit] Init feature 'feature-new-base-image'.


From d7245df8bbbea86ed8a33c91b686e7c90e8bba63 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bertrand.gouny@osixia.fr>
Date: Thu, 8 May 2014 17:53:41 +0200
Subject: [PATCH 2/3] osixia base

---
 Dockerfile | 3 +++
 slapd.sh   | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b07dd25..734416c 100644
--- a/Dockerfile
+++ b/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"]
 
diff --git a/slapd.sh b/slapd.sh
index ed43102..a33da2c 100755
--- a/slapd.sh
+++ b/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
 

From e3588f93f2583045ce171c0bae2a6d715f99e69d Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bertrand.gouny@osixia.fr>
Date: Thu, 8 May 2014 17:54:05 +0200
Subject: [PATCH 3/3] [twgit] Init release 'release-0.6.0'.