浏览代码

fixes slapd tcp bind is network not interface, and so does not respond on overlay networks #35

ofreax 9 年之前
父节点
当前提交
ff005c348f
共有 8 个文件被更改,包括 12 次插入2 次删除
  1. 6 1
      CHANGELOG.md
  2. 1 1
      image/service/slapd/process.sh
  3. 5 0
      image/service/slapd/startup.sh
  4. 二进制
      test/database/__db.001
  5. 二进制
      test/database/__db.002
  6. 二进制
      test/database/__db.003
  7. 二进制
      test/database/alock
  8. 二进制
      test/database/log.0000000001

+ 6 - 1
CHANGELOG.md

@@ -1,7 +1,12 @@
 # Changelog
 
 ## 1.1.2
-Merge pull request Honor LDAP_LOG_LEVEL on startup #39
+Merge pull request :
+  - Honor LDAP_LOG_LEVEL on startup #39
+  
+Fix :
+  - slapd tcp bind is network not interface, and so does not respond on overlay networks #35
+  - specify base_dn without domain #37
 
 ## 1.1.1
 Update to light-baseimage:0.2.2

+ 1 - 1
image/service/slapd/process.sh

@@ -9,4 +9,4 @@ log-helper level eq trace && set -x
 # see https://github.com/docker/docker/issues/8231
 ulimit -n 1024
 
-exec /usr/sbin/slapd -h "ldap://$HOSTNAME ldaps://$HOSTNAME ldap://localhost ldaps://localhost ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL
+exec /usr/sbin/slapd -h "ldap://$HOSTNAME ldaps://$HOSTNAME ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL

+ 5 - 0
image/service/slapd/startup.sh

@@ -337,4 +337,9 @@ fi
 ln -sf ${CONTAINER_SERVICE_DIR}/slapd/assets/.ldaprc $HOME/.ldaprc
 ln -sf ${CONTAINER_SERVICE_DIR}/slapd/assets/ldap.conf /etc/ldap/ldap.conf
 
+# force OpenLDAP to listen on all interfaces
+ETC_HOSTS=$(cat /etc/hosts | sed "/$HOSTNAME/d")
+echo "0.0.0.0 $HOSTNAME" > /etc/hosts
+echo "$ETC_HOSTS" >> /etc/hosts
+
 exit 0

二进制
test/database/__db.001


二进制
test/database/__db.002


二进制
test/database/__db.003


二进制
test/database/alock


二进制
test/database/log.0000000001