Updated LDAP

ldap/Dockerfile

@@ -28,8 +28,11 @@ RUN apt-get update && apt-get install -y \
     fusiondirectory \
     fusiondirectory-schema  \
     fusiondirectory-plugin-ssh
+    
+RUN apt-get update && apt-get install -y phpldapadmin
 
 COPY ./data/start.sh /opt/start.sh
+COPY ./data/config.php /etc/phpldapadmin/config.php
 
 EXPOSE 22 8000 389
 

web/warpzone/settings.py

@@ -103,8 +103,8 @@ DATABASES = {
     },
     'ldap': {
         'ENGINE': 'ldapdb.backends.ldap',
-        'NAME': 'ldap://s1.dyhost.de/',
-        #'NAME': 'ldap://ldap/',
+        #'NAME': 'ldap://s1.dyhost.de/',
+        'NAME': 'ldap://ldap/',
         'USER': 'cn=admin,dc=warpzone,dc=ms',
         'PASSWORD': '12345',
     }
@@ -139,14 +139,14 @@ AUTHENTICATION_BACKENDS = (
 # AUTH LDAP SETTINGS
 #
 
-AUTH_LDAP_SERVER_URI = "ldap://s1.dyhost.de"
-#AUTH_LDAP_SERVER_URI = "ldap://ldap"
+#AUTH_LDAP_SERVER_URI = "ldap://s1.dyhost.de"
+AUTH_LDAP_SERVER_URI = "ldap://ldap"
 
 AUTH_LDAP_BIND_DN = "cn=admin,dc=warpzone,dc=ms"
 AUTH_LDAP_BIND_PASSWORD = "12345"
 
 
-AUTH_LDAP_USER_SEARCH_PATH = "ou=User,dc=warpzone,dc=ms"
+AUTH_LDAP_USER_SEARCH_PATH = "ou=people,dc=warpzone,dc=ms"
 AUTH_LDAP_USER_SEARCH_FILTER = "(uid=%(user)s)"
 
 AUTH_LDAP_USER_SEARCH = LDAPSearch(AUTH_LDAP_USER_SEARCH_PATH,
@@ -163,10 +163,10 @@ AUTH_LDAP_GROUP_SEARCH = LDAPSearch(AUTH_LDAP_GROUP_SEARCH_PATH,
 AUTH_LDAP_GROUP_TYPE = PosixGroupType()
 
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {
-    "is_active": "cn=active,ou=Groups,dc=warpzone,dc=ms",
-    "is_staff": ["cn=superuser,ou=Groups,dc=warpzone,dc=ms",
-                 "cn=superuser,ou=Groups,dc=warpzone,dc=ms"],
-    "is_superuser": "cn=superuser,ou=Groups,dc=warpzone,dc=ms"
+    "is_active": "cn=active,ou=groups,ou=warpauth,ou=infrastructure,dc=warpzone,dc=ms",
+    "is_staff": ["cn=superuser,ou=groups,ou=warpauth,ou=infrastructure,dc=warpzone,dc=ms",
+                 "cn=superuser,ou=groups,ou=warpauth,ou=infrastructure,dc=warpzone,dc=ms"],
+    "is_superuser": "cn=superuser,ou=groups,ou=warpauth,ou=infrastructure,dc=warpzone,dc=ms"
 }
 
 AUTH_LDAP_FIND_GROUP_PERMS = True