Merge branch 'hotfix-0.7.3' into stable

This commit is contained in:
Bertrand Gouny committed 2014-06-19 13:50:48 +02:00
commit 35904aa284
1 file changed
+4 -3
+4 -3
View File
@@ -46,7 +46,8 @@ fi
if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
status "Custom config" status "Custom config"
slapd -h "ldapi:///" slapd -h "ldapi:///" -u openldap -g openldap
chown -R openldap:openldap /etc/ldap
# TLS # TLS
if [ -e /etc/ldap/ssl/ldap.crt ] && [ -e /etc/ldap/ssl/ldap.key ] && [ -e /etc/ldap/ssl/ca.crt ]; then if [ -e /etc/ldap/ssl/ldap.crt ] && [ -e /etc/ldap/ssl/ldap.key ] && [ -e /etc/ldap/ssl/ca.crt ]; then
@@ -85,5 +86,5 @@ fi
status "starting slapd on default port 389" status "starting slapd on default port 389"
set -x set -x
#with debug: #with debug:
#exec /usr/sbin/slapd -h "ldap:///" -d -1 #exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
exec /usr/sbin/slapd -h "ldap:///" exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap