forked from DGNum/gestioCOF
Merge branch 'master' into Kerl/ldap
This commit is contained in:
commit
540b6f38b8
973 changed files with 9243 additions and 79642 deletions
|
@ -120,10 +120,6 @@ USE_TZ = True
|
|||
STATIC_URL = '/static/'
|
||||
STATIC_ROOT = '/var/www/static/'
|
||||
|
||||
STATICFILES_DIRS = (
|
||||
os.path.join(BASE_DIR, 'static/'),
|
||||
)
|
||||
|
||||
# Media upload (through ImageField, SiteField)
|
||||
# https://docs.djangoproject.com/en/1.9/ref/models/fields/
|
||||
|
||||
|
@ -159,6 +155,7 @@ CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
|
|||
AUTHENTICATION_BACKENDS = (
|
||||
'django.contrib.auth.backends.ModelBackend',
|
||||
'gestioncof.shared.COFCASBackend',
|
||||
'kfet.backends.GenericTeamBackend',
|
||||
)
|
||||
|
||||
# LDAP_SERVER_URL = 'ldaps://ldap.spi.ens.fr:636'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue