Merge branch 'hotfix-0.7.2' into stable

pb droits
[twgit] Init hotfix 'hotfix-0.7.2'.
2014-06-18 17:29:34 +02:00 · 2014-06-18 17:29:25 +02:00 · 2014-06-18 17:28:24 +02:00 · 2014-06-18 17:12:31 +02:00 · 2014-06-18 17:12:22 +02:00 · 2014-06-18 17:07:08 +02:00
1 changed files with 4 additions and 3 deletions
@@ -46,8 +46,7 @@ fi
 if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
  status "Custom config"

-  slapd -h "ldapi:///" -u openldap -g openldap 
-  chown -R openldap:openldap /etc/ldap
+  slapd -h "ldapi:///" 

  # TLS
  if [ -e /etc/ldap/ssl/ldap.crt ] && [ -e /etc/ldap/ssl/ldap.key ] && [ -e /etc/ldap/ssl/ca.crt ]; then
@@ -85,4 +84,6 @@ fi

 status "starting slapd on default port 389"
 set -x
-exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
+#with debug:
+#exec /usr/sbin/slapd -h "ldap:///" -d -1
+exec /usr/sbin/slapd -h "ldap:///"
Author	SHA1	Message	Date
Bertrand Gouny	9531804222	Merge branch 'hotfix-0.7.2' into stable	2014-06-18 17:29:34 +02:00
Bertrand Gouny	faeb220686	pb droits	2014-06-18 17:29:25 +02:00
Bertrand Gouny	987d044727	[twgit] Init hotfix 'hotfix-0.7.2'.	2014-06-18 17:28:24 +02:00
Bertrand Gouny	ba0b83ad27	Merge branch 'hotfix-0.7.1' into stable	2014-06-18 17:12:31 +02:00
Bertrand Gouny	ccaf1cf6bc	correction utilisateur slapd deamon	2014-06-18 17:12:22 +02:00
Bertrand Gouny	e303d10740	[twgit] Init hotfix 'hotfix-0.7.1'.	2014-06-18 17:07:08 +02:00