Changeset 12909 for trunk

Timestamp:

04/21/11 14:19:20 (13 years ago)

Author:

sil

Message:

Added option to setup as a client/server, to include/exclude (for example) LDAP specific settings. fixes #3140

Location:

trunk/sara_cmt/sara_cmt

Files:

• cluster/models.py (modified) (1 diff)
• settings.py (modified) (2 diffs)

trunk/sara_cmt/sara_cmt/cluster/models.py

@@ -17 +17 @@
 from django_extensions.db.fields import CreationDateTimeField, \
                                         ModificationDateTimeField
-from sara_cmt import settings
 
 

trunk/sara_cmt/sara_cmt/settings.py

@@ -9 +9 @@
 SARACMT_BASE = os.path.normpath(os.path.dirname(__file__))
 PROJECT_BASE = os.path.normpath(os.path.join(SARACMT_BASE, os.path.pardir))
+CLIENT_ONLY = True
 
 DEBUG = True
@@ -36 +37 @@
 # <AUTH AGAINST LDAP> (based on http://packages.python.org/django-auth-ldap/)
 #
-import ldap
-from django_auth_ldap.config import LDAPSearch, PosixGroupType
+if not CLIENT_ONLY:
+    import ldap
+    from django_auth_ldap.config import LDAPSearch, PosixGroupType
 
 
-# Baseline configuration.
-AUTH_LDAP_SERVER_URI = "ldaps://ldap.cua.sara.nl"
+    # Baseline configuration.
+    AUTH_LDAP_SERVER_URI = "ldaps://ldap.cua.sara.nl"
 
-# Set AUTH_LDAP_USER_DN_TEMPLATE to a template that will produce the
-# authenticating user's DN directly. This template should have one
-# placeholder, %(user)s.
-AUTH_LDAP_USER_DN_TEMPLATE = 'uid=%(user)s,ou=Users,dc=hpcv,dc=sara,dc=nl'
+    # Set AUTH_LDAP_USER_DN_TEMPLATE to a template that will produce the
+    # authenticating user's DN directly. This template should have one
+    # placeholder, %(user)s.
+    AUTH_LDAP_USER_DN_TEMPLATE = 'uid=%(user)s,ou=Users,dc=hpcv,dc=sara,dc=nl'
 
-# Set up the basic group parameters.
-AUTH_LDAP_GROUP_SEARCH = LDAPSearch('ou=Groups,dc=hpcv,dc=sara,dc=nl',
-    ldap.SCOPE_SUBTREE, '(objectClass=posixGroup)',
-)
-AUTH_LDAP_GROUP_TYPE = PosixGroupType()
+    # Set up the basic group parameters.
+    AUTH_LDAP_GROUP_SEARCH = LDAPSearch('ou=Groups,dc=hpcv,dc=sara,dc=nl',
+        ldap.SCOPE_SUBTREE, '(objectClass=posixGroup)',
+    )
+    AUTH_LDAP_GROUP_TYPE = PosixGroupType()
 
-## Only users in this group can log in.
-AUTH_LDAP_REQUIRE_GROUP = 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl'
+    ## Only users in this group can log in.
+    AUTH_LDAP_REQUIRE_GROUP = 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl'
 
-# Populate the Django user from the LDAP directory.
-AUTH_LDAP_USER_ATTR_MAP = {
-    'first_name': 'givenName',
-    'last_name': 'sn',
-    'email': 'mail',
-}
+    # Populate the Django user from the LDAP directory.
+    AUTH_LDAP_USER_ATTR_MAP = {
+        'first_name': 'givenName',
+        'last_name': 'sn',
+        'email': 'mail',
+    }
 
-AUTH_LDAP_USER_FLAGS_BY_GROUP = {
-    'is_active': 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl',
-    'is_staff': 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl',
-    'is_superuser': 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl',
-}
+    AUTH_LDAP_USER_FLAGS_BY_GROUP = {
+        'is_active': 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl',
+        'is_staff': 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl',
+        'is_superuser': 'cn=hpcv_admin,ou=Groups,dc=hpcv,dc=sara,dc=nl',
+    }
 
-# This is the default, but I like to be explicit.
-AUTH_LDAP_ALWAYS_UPDATE_USER = True
+    # This is the default, but I like to be explicit.
+    AUTH_LDAP_ALWAYS_UPDATE_USER = True
 
-# Cache group memberships for an hour to minimize LDAP traffic
-AUTH_LDAP_CACHE_GROUPS = True
-AUTH_LDAP_GROUP_CACHE_TIMEOUT = 3600
+    # Cache group memberships for an hour to minimize LDAP traffic
+    AUTH_LDAP_CACHE_GROUPS = True
+    AUTH_LDAP_GROUP_CACHE_TIMEOUT = 3600
 
-# Keep ModelBackend around for per-user permissions and maybe a local
-# superuser.
-AUTHENTICATION_BACKENDS = (
-    'django_auth_ldap.backend.LDAPBackend',
-    'django.contrib.auth.backends.ModelBackend',
-)
+    # Keep ModelBackend around for per-user permissions and maybe a local
+    # superuser.
+    AUTHENTICATION_BACKENDS = (
+        'django_auth_ldap.backend.LDAPBackend',
+        'django.contrib.auth.backends.ModelBackend',
+    )
 #
 # </AUTH AGAINST LDAP>