Merge pull request #3 from joshmoore/fix-m21

Fix m21
ome · Feb 23, 2016 · bf6e7bd · bf6e7bd
2 parents f4e0831 + 2a928ba
commit bf6e7bd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.*un~
diff --git a/Dockerfile b/Dockerfile
@@ -45,6 +45,7 @@ RUN chown ${APACHEDS_USER}:${APACHEDS_GROUP} ${APACHEDS_CMD} \
     && chmod u+rx ${APACHEDS_CMD}
 
 ADD instance/* ${APACHEDS_BOOTSTRAP}/conf/
+ADD ome.ldif ${APACHEDS_BOOTSTRAP}/
 RUN mkdir ${APACHEDS_BOOTSTRAP}/cache \
     && mkdir ${APACHEDS_BOOTSTRAP}/run \
     && mkdir ${APACHEDS_BOOTSTRAP}/log \

diff --git a/instance/config.ldif b/instance/config.ldif
@@ -89,6 +89,7 @@ objectClass: ads-authenticator
 objectClass: ads-authenticatorImpl
 ads-authenticatorClass: org.apache.directory.server.core.authn.AnonymousAuthenticator
 ads-enabled: TRUE
+ads-baseDn: ou=config
 
 dn: ads-authenticatorid=simpleauthenticator,ou=authenticators,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
 ads-authenticatorid: simpleauthenticator
@@ -98,6 +99,7 @@ objectClass: ads-authenticator
 objectClass: ads-authenticatorImpl
 ads-authenticatorClass: org.apache.directory.server.core.authn.SimpleAuthenticator
 ads-enabled: TRUE
+ads-baseDn: ou=config
 
 dn: ads-authenticatorid=strongauthenticator,ou=authenticators,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
 ads-authenticatorid: strongauthenticator
@@ -107,6 +109,7 @@ objectClass: ads-authenticator
 objectClass: ads-authenticatorImpl
 ads-authenticatorClass: org.apache.directory.server.core.authn.StrongAuthenticator
 ads-enabled: TRUE
+ads-baseDn: ou=config
 
 dn: ou=passwordPolicies,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
 objectClass: organizationalUnit

diff --git a/instance/wrapper.conf → instance/wrapper-instance.conf b/instance/wrapper.conf → instance/wrapper-instance.conf
diff --git a/ome.ldif b/ome.ldif
@@ -0,0 +1,23 @@
+version: 1
+
+dn: dc=org
+objectClass: extensibleObject
+objectClass: domain
+objectClass: top
+dc: org
+
+dn: dc=openmicroscopy,dc=org
+objectClass: extensibleObject
+objectClass: domain
+objectClass: top
+dc: openmicroscopy
+
+dn: ou=Users,dc=openmicroscopy,dc=org
+objectClass: organizationalUnit
+objectClass: top
+ou: Users
+
+dn: ou=Groups,dc=openmicroscopy,dc=org
+objectClass: organizationalUnit
+objectClass: top
+ou: Groups