Commit 7ec79495 authored by Olga Brani's avatar Olga Brani
Browse files

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
	snf-astakos-app/astakos/im/templates/im/resource_usage.html
parents 2b7f97f7 59eafab5
......@@ -135,6 +135,18 @@ class LocalAuthProvider(AuthProvider):
def extra_actions(self):
return [(_('Change password'), reverse('password_change')), ]
class LDAPAuthProvider(AuthProvider):
module = 'ldap'
title = _('LDAP credentials')
description = _('Allows you to login using your LDAP credentials')
one_per_user = True
login_template = 'im/auth/local_login_form.html'
login_prompt_template = 'im/auth/local_login_prompt.html'
signup_prompt_template = 'im/auth/local_signup_prompt.html'
details_tpl = _('You can login to your account using your'
' %(auth_backend)s password.')
class ShibbolethAuthProvider(AuthProvider):
module = 'shibboleth'
......
......@@ -83,7 +83,7 @@ static_files = {'astakos.im': ''}
# The following settings will replace the default django settings
AUTHENTICATION_BACKENDS = (
# 'django_auth_ldap.backend.LDAPBackend',
'django_auth_ldap.backend.LDAPBackend',
'astakos.im.auth_backends.EmailBackend',
'astakos.im.auth_backends.TokenBackend')
LOGIN_URL = '/im'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment