entrouvert
/
compte-agglo-montpellier
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

adapt to module reorganization in authentic2 and portail-citoyen

This commit is contained in:
Benjamin Dauvergne 2014-03-21 11:27:08 +01:00
parent 6d65111ed7
commit ef33765bd7
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compte_agglo_montpellier/dashboard.py
View File

@ -45,7 +45,7 @@ class CustomIndexDashboard(Dashboard):
_('Contents'),
models=(
'cms.models.pagemodel.Page',
'data_source_plugin.models.DataSource',
'portail_citoyen.apps.data_source_plugin.models.DataSource',
'feed_plugin.models.Feed',
'stacks.*',
),

32
compte_agglo_montpellier/settings.py
View File

@ -133,15 +133,6 @@ if os.environ.get('TEMPLATE_DIRS'):
else:
TEMPLATE_DIRS += ('/var/lib/%s/templates' % PROJECT_NAME,) + TEMPLATE_DIRS
import sys
import os
apps_dir = os.path.join(os.path.dirname(__file__), 'apps')
if apps_dir not in sys.path:
sys.path.append(apps_dir)
import portail_citoyen # FIXME: without that sys.path does not contain portail_citoyen.apps
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
@ -184,13 +175,12 @@ INSTALLED_APPS = (
'portail_citoyen_announces',
'portail_citoyen',
'wcsinst.wcsinst',
'feed_plugin',
'portail_citoyen_announces',
'data_source_plugin',
'auquotidien_plugin',
'a2_service_list_plugin',
'passerelle_register_plugin',
'federation_plugin',
'portail_citoyen.apps.feed_plugin',
'portail_citoyen.apps.data_source_plugin',
'portail_citoyen.apps.federation_plugin',
'portail_citoyen.apps.auquotidien_plugin',
'portail_citoyen.apps.passerelle_register_plugin',
'compte_agglo_montpellier',
)
@ -286,7 +276,7 @@ USE_DISCO_SERVICE = 'USE_DISCO_SERVICE' in os.environ
###########################
# Only RSA private keys are currently supported
AUTH_FRONTENDS = ( 'authentic2.auth2_auth.backend.LoginPasswordBackend',)
AUTH_FRONTENDS = ( 'authentic2.auth_frontends.LoginPasswordBackend',)
SSLAUTH_CREATE_USER = 'SSLAUTH_CREATE_USER' in os.environ
AUTHENTICATION_EVENT_EXPIRATION = int(os.environ.get('AUTHENTICATION_EVENT_EXPIRATION', 3600*24*7))
@ -455,7 +445,6 @@ ADMIN_TOOLS_APP_INDEX_DASHBOARD = 'compte_agglo_montpellier.dashboard.CustomAppI
ADMIN_TOOLS_MENU = 'compte_agglo_montpellier.menu.CustomMenu'
ADMIN_TOOLS_THEMING_CSS = 'portail_citoyen/css/admin.css'
AUTH_SAML2 = 'AUTH_SAML2' in os.environ
AUTH_OPENID = 'AUTH_OPENID' in os.environ
AUTH_SSL = 'AUTH_SSL' in os.environ
AUTH_OATH = 'AUTH_OATH' in os.environ
@ -553,15 +542,6 @@ if USE_DEBUG_TOOLBAR:
except ImportError:
print "Debug toolbar missing, not loaded"
if AUTH_SAML2:
INSTALLED_APPS += ('authentic2.authsaml2',)
AUTHENTICATION_BACKENDS += (
'authentic2.authsaml2.backends.AuthSAML2PersistentBackend',
'authentic2.authsaml2.backends.AuthSAML2TransientBackend')
AUTH_FRONTENDS += ('authentic2.authsaml2.frontend.AuthSAML2Frontend',)
IDP_BACKENDS += ('authentic2.authsaml2.backends.AuthSAML2Backend',)
DISPLAY_MESSAGE_ERROR_PAGE = True
if AUTH_OPENID:
INSTALLED_APPS += ('authentic2.auth2_auth.auth2_openid', 'django_authopenid',)
AUTH_FRONTENDS += ('authentic2.auth2_auth.auth2_openid.backend.OpenIDFrontend',)