Gitlab CSE Unil

Commit 0fee085a authored by M. Chardon's avatar M. Chardon
Browse files

integration shibboleth

parent 31e40a99
......@@ -337,13 +337,13 @@ ATTP = {
# ..... SHIBAUTH
# LOCAL_APPS += ('shibauth', )
# AUTHENTICATION_BACKENDS = ('shibauth.shibbolethbackends.ShibbolethBackend',) + AUTHENTICATION_BACKENDS
LOCAL_APPS += ('shibauth', )
AUTHENTICATION_BACKENDS = ('shibauth.shibbolethbackends.ShibbolethBackend',) + AUTHENTICATION_BACKENDS
#try:
# from .components.shibbauth import *
#except ImportError:
# raise ImproperlyConfigured("Unable to import SHIBAUTH configurations")
try:
from .components.shibbauth import *
except ImportError:
raise ImproperlyConfigured("Unable to import SHIBAUTH configurations")
# ---------- END LOCAL APPS CONFIGURATION
......@@ -362,7 +362,7 @@ DJANGO_APPS = (
INSTALLED_APPS = DJANGO_APPS + LOCAL_APPS
# ---------- END APPS CONFIGURATION
SERVER_EMAIL = 'marion.chardon@unil.ch'
SERVER_EMAIL = 'riset-admin@unil.ch'
EMAIL_HOST = "smtp.unil.ch"
......@@ -469,11 +469,11 @@ LOGGING = {
'level': 'DEBUG',
'propagate': True,
},
#'shibauth': {
# 'handlers': ['console', 'file_debug', 'file'],
# 'level': 'DEBUG',
# 'propagate': True,
#},
'shibauth': {
'handlers': ['console', 'file_debug', 'file'],
'level': 'DEBUG',
'propagate': True,
},
}
}
......
......@@ -16,8 +16,9 @@ urlpatterns = [
url(r'^s-412-5/admin/', admin.site.urls),
url(r'^shibauth/', include('shibauth.urls')),
url(r'^accounts/login/$', views.login, {'template_name': "adim/home.html"}, name='django.contrib.auth.views.login'),
url(r'^accounts/logout/$', views.logout, name='logout'),
#re_path(r'^login/$', auth_views.LoginView.as_view(), name='django.contrib.auth.views.login'),
url(r'^accounts/login/$', views.LoginView.as_view(), {'template_name': "adim/home.html"}, name='django.contrib.auth.views.login'),
url(r'^accounts/logout/$', views.LogoutView.as_view(), name='logout'),
url(r'^api/', include('adim.urls')),
url(r'^attp/', include('adim_ttp.urls')),
......
......@@ -3,8 +3,8 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adim_project.settings")
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adim_project.settings.local")
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adim_project.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adim_project.settings.local")
#os.environ.setdefault('DJANGO_CONFIGURATION', 'Dev')
from django.core.management import execute_from_command_line
......
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