Merge pull request #32 from mlewe/master
ldap: separate user and group base-dn
This commit is contained in:
commit
94c705272c
|
@ -10,10 +10,11 @@ ENV XMPP_MUC chat.example.com
|
||||||
ENV XMPP_STARTUP groupchat/room%40chat.example.com
|
ENV XMPP_STARTUP groupchat/room%40chat.example.com
|
||||||
ENV XMPP_ADMIN admin
|
ENV XMPP_ADMIN admin
|
||||||
|
|
||||||
ENV LDAP_BASE dc=example.com
|
|
||||||
ENV LDAP_DN cn=admin,dc=example.com
|
ENV LDAP_DN cn=admin,dc=example.com
|
||||||
ENV LDAP_PWD password
|
ENV LDAP_PWD password
|
||||||
ENV LDAP_GROUP mygroup
|
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 && \
|
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 && \
|
sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list && \
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
"address": "{{LDAP_HOST}}",
|
"address": "{{LDAP_HOST}}",
|
||||||
"user": "{{LDAP_DN}}",
|
"user": "{{LDAP_DN}}",
|
||||||
"password": "{{LDAP_PWD}}",
|
"password": "{{LDAP_PWD}}",
|
||||||
"base": "ou=users,{{LDAP_BASE}}",
|
"base": "{{LDAP_USER_BASE}}",
|
||||||
"filter": "objectClass=person",
|
"filter": "objectClass=person",
|
||||||
"group": "cn={{LDAP_GROUP}},ou=groups,{{LDAP_BASE}}"
|
"group": "cn={{LDAP_GROUP}},{{LDAP_GROUP_BASE}}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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/{{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_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_DN}}/'"${LDAP_DN}"'/' -i /app/config/dev_config.json
|
||||||
sed 's/{{LDAP_PWD}}/'"${LDAP_PWD}"'/' -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
|
sed 's/{{LDAP_GROUP}}/'"${LDAP_GROUP}"'/' -i /app/config/dev_config.json
|
||||||
|
|
Loading…
Reference in New Issue