Merge pull request #7 from cknitt/stable

Make log level configurable via environment variable

image/Dockerfile

@@ -12,13 +12,11 @@ RUN apt-get -y update && /sbin/enable-service ssl-kit \
 	&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes --no-install-recommends slapd ldap-utils \
 	&& rm -rf /var/lib/ldap
 
-# Add install script and OpenLDAP assets
-ADD service/install.sh /tmp/install.sh
+# Add OpenLDAP assets
 ADD service/slapd/assets /osixia/slapd
 
-# Run install script and clean all
-RUN ./tmp/install.sh \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+# Clean all
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Add default env variables
 ADD env.yml /etc/env.yml
@@ -31,4 +29,4 @@ ADD service/slapd/daemon.sh /etc/service/slapd/run
 VOLUME ["/var/lib/ldap", "/etc/ldap/slapd.d"]
 
 # Expose ldap default port
-EXPOSE 389
+EXPOSE 389

image/env.yml

@@ -1,10 +1,11 @@
 LDAP_ORGANISATION: Example Inc.
 LDAP_DOMAIN: example.org
 LDAP_ADMIN_PASSWORD: admin
+LDAP_LOG_LEVEL: -1
 
 SERVER_NAME: ldap.example.org
 
 USE_TLS: true
 SSL_CRT_FILENAME: ldap.crt
 SSL_KEY_FILENAME: ldap.key
-SSL_CA_CRT_FILENAME: ca.crt
+SSL_CA_CRT_FILENAME: ca.crt

image/service/install.sh

@@ -1,6 +0,0 @@
-#!/bin/bash -e
-# this script is run during the image build
-
-# Enable access only from docker default network and localhost
-echo "slapd: 172.17.0.0/255.255.0.0 127.0.0.1 : ALLOW" >> /etc/hosts.allow
-echo "slapd: ALL : DENY" >> /etc/hosts.allow

image/service/slapd/daemon.sh

@@ -1,2 +1,2 @@
 #!/bin/bash -e
-exec /usr/sbin/slapd -h "ldap:/// ldapi:///" -u openldap -g openldap -d -1
+exec /usr/sbin/slapd -h "ldap:/// ldapi:///" -u openldap -g openldap -d "$LDAP_LOG_LEVEL"