From bf7fdc00bfecee47a3d5025de077bb0640dd3146 Mon Sep 17 00:00:00 2001 From: tr4ck3ur Date: Sat, 14 Feb 2015 03:40:14 +0100 Subject: Many changes to reorganize third party javascript --- jm2l/__init__.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'jm2l/__init__.py') diff --git a/jm2l/__init__.py b/jm2l/__init__.py index 1be4a2b..61ff343 100644 --- a/jm2l/__init__.py +++ b/jm2l/__init__.py @@ -4,19 +4,23 @@ from pyramid.config import Configurator from pyramid.renderers import JSON, JSONP from pyramid.session import SignedCookieSessionFactory from sqlalchemy import engine_from_config - +from pyramid.renderers import render_to_response from .models import DBSession, get_user from .security import EntryFactory, groupfinder import locale + def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ locale.setlocale(locale.LC_ALL, "fr_FR.UTF-8") engine = engine_from_config(settings, 'sqlalchemy.') DBSession.configure(bind=engine) - my_session_factory = SignedCookieSessionFactory('itsaseekreet') - authentication_policy = AuthTktAuthenticationPolicy('somesecret', + # Extract secrets from configuration file + CookiesPasswd = settings.get('secret_Cookies', 'itsthefirstseekreet') + AuthTktPasswd = settings.get('secret_AuthTkt', 'itsthesecondseekreet') + my_session_factory = SignedCookieSessionFactory(CookiesPasswd) + authentication_policy = AuthTktAuthenticationPolicy(AuthTktPasswd, callback=groupfinder, hashalg='sha512', debug=True) authorization_policy = ACLAuthorizationPolicy() config = Configurator(settings=settings, @@ -30,6 +34,9 @@ def main(global_config, **settings): config.add_request_method(get_user, 'user', reify=True) config.add_static_view('static', 'static', cache_max_age=3600) config.add_static_view('img', 'static/img', cache_max_age=3600) + config.add_static_view('css', 'static/css', cache_max_age=3600) + config.add_static_view('js', 'static/js', cache_max_age=3600) + config.add_static_view('vendor', 'static/vendor', cache_max_age=3600) config.add_static_view('upload', 'upload', cache_max_age=3600) config.add_route('tester', '/tester') @@ -108,5 +115,8 @@ def main(global_config, **settings): config.add_route('blog', '/blog/{id:\d+}/{slug}') config.add_route('blog_action', '/blog/{action}', factory='jm2l.security.EntryFactory') + config.scan() return config.make_wsgi_app() + + -- cgit v1.2.3-54-g00ecf