moparisthebest/kaiwa
1
0
Fork 0
mirror of https://github.com/moparisthebest/kaiwa synced 2024-11-15 14:04:59 -05:00
Code Issues Releases Wiki Activity

Merge pull request #32 from mlewe/master

Browse Source 
ldap: separate user and group base-dn
This commit is contained in:
sebu77 2015-09-08 19:11:45 +02:00
commit 94c705272c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Docker/Dockerfile
View File

@ -10,10 +10,11 @@ ENV XMPP_MUC chat.example.com
ENV XMPP_STARTUP groupchat/room%40chat.example.com
ENV XMPP_ADMIN admin
ENV LDAP_BASE dc=example.com
ENV LDAP_DN cn=admin,dc=example.com
ENV LDAP_PWD password
ENV LDAP_GROUP mygroup
ENV LDAP_USER_BASE ou=users,dc=example.com
ENV LDAP_GROUP_BASE ou=groups,dc=example.com
RUN sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list && \
sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list && \

4
Docker/app/config/dev_config.json
View File

@ -21,8 +21,8 @@
"address": "{{LDAP_HOST}}",
"user": "{{LDAP_DN}}",
"password": "{{LDAP_PWD}}",
"base": "ou=users,{{LDAP_BASE}}",
"base": "{{LDAP_USER_BASE}}",
"filter": "objectClass=person",
"group": "cn={{LDAP_GROUP}},ou=groups,{{LDAP_BASE}}"
"group": "cn={{LDAP_GROUP}},{{LDAP_GROUP_BASE}}"
}
}

3
Docker/app/start.sh
View File

@ -17,7 +17,8 @@ sed 's/{{XMPP_STARTUP}}/'"${XMPP_STARTUP}"'/' -i /app/config/dev_config.json
sed 's/{{XMPP_ADMIN}}/'"${XMPP_ADMIN}"'/' -i /app/config/dev_config.json
sed 's/{{LDAP_HOST}}/'"${LDAP_PORT_389_TCP_ADDR}"'/' -i /app/config/dev_config.json
sed 's/{{LDAP_BASE}}/'"${LDAP_BASE}"'/' -i /app/config/dev_config.json
sed 's/{{LDAP_USER_BASE}}/'"${LDAP_USER_BASE}"'/' -i /app/config/dev_config.json
sed 's/{{LDAP_GROUP_BASE}}/'"${LDAP_GROUP_BASE}"'/' -i /app/config/dev_config.json
sed 's/{{LDAP_DN}}/'"${LDAP_DN}"'/' -i /app/config/dev_config.json
sed 's/{{LDAP_PWD}}/'"${LDAP_PWD}"'/' -i /app/config/dev_config.json
sed 's/{{LDAP_GROUP}}/'"${LDAP_GROUP}"'/' -i /app/config/dev_config.json