Skip to content

Commit

Permalink
settings: use crowd for auth instead of ldap
Browse files Browse the repository at this point in the history
  • Loading branch information
colegleason committed Jan 20, 2015
1 parent 8cd3014 commit e5e7c2d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 66 deletions.
1 change: 1 addition & 0 deletions liquid/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ simplejson==2.4.0
six==1.3.0
wsgiref==0.1.2
enum34
django-crowd==0.41dev
33 changes: 4 additions & 29 deletions liquid/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,25 +192,10 @@

SERVE_STATIC = True


## LDAP STUFF ## should be in local_settings for security

#AD_DNS_NAME='your-ldap-server.com'
# If using non-SSL use these
#AD_LDAP_PORT=389
#AD_LDAP_URL='ldap://%s:%s' % (AD_DNS_NAME,AD_LDAP_PORT)
# If using SSL use these:
#AD_LDAP_PORT=636
#AD_LDAP_URL='ldaps://%s:%s' % (AD_DNS_NAME,AD_LDAP_PORT)
#AD_SEARCH_DN='dc=mygroup,dc=net,dc=com'
#AD_NT4_DOMAIN='YOURDOMAIN'
#AD_SEARCH_FIELDS= ['mail','givenName','sn','sAMAccountName','memberOf']
#AD_MEMBERSHIP_REQ=['Group_Required','Alternative_Group']
#AD_CERT_FILE='/path/to/your/cert.txt'
#AD_DEBUG=True
#AD_DEBUG_FILE='/path/to/writable/log/file/ldap.debug'
AUTHENTICATION_BACKENDS = ('utils.ldapauth.ActiveDirectoryGroupMembershipSSLBackend',
'django.contrib.auth.backends.ModelBackend',)
AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
'crowd.backends.CrowdBackend',
)

PASSWORD_HASHERS = (
'django.contrib.auth.hashers.PBKDF2PasswordHasher',
Expand Down Expand Up @@ -244,16 +229,6 @@
)


# ldap things
AD_DNS_NAME= 'ad.uillinois.edu'
AD_LDAP_PORT=389
AD_LDAP_URL='ldap://%s:%s' % (AD_DNS_NAME,AD_LDAP_PORT)
AD_BIND_DN='{0}@illinois.edu'
AD_NT4_DOMAIN='AD.UILLINOIS.EDU'
AD_SEARCH_FIELDS= ['givenName','sn','sAMAccountName']
AD_DEBUG=True
AD_DEBUG_FILE='/var/log/apache2/ldap.debug'

CRON_IPS = ['172.22.32.110']
CRON_PASSWORD = ""

Expand Down
37 changes: 0 additions & 37 deletions liquid/utils/ldapauth.py

This file was deleted.

0 comments on commit e5e7c2d

Please sign in to comment.