##// END OF EJS Templates
added base path into config
marcink -
r309:7e4771a0 default
parent child Browse files
Show More
@@ -3,7 +3,7 b' from mako.lookup import TemplateLookup'
3 from pylons.configuration import PylonsConfig
3 from pylons.configuration import PylonsConfig
4 from pylons.error import handle_mako_error
4 from pylons.error import handle_mako_error
5 from pylons_app.config.routing import make_map
5 from pylons_app.config.routing import make_map
6 from pylons_app.lib.auth import set_available_permissions
6 from pylons_app.lib.auth import set_available_permissions, set_base_path
7 from pylons_app.lib.utils import repo2db_mapper
7 from pylons_app.lib.utils import repo2db_mapper
8 from pylons_app.model import init_model
8 from pylons_app.model import init_model
9 from pylons_app.model.hg_model import _get_repos_cached_initial
9 from pylons_app.model.hg_model import _get_repos_cached_initial
@@ -63,7 +63,7 b' def load_environment(global_conf, app_co'
63 init_model(sa_engine_db1)
63 init_model(sa_engine_db1)
64 repo2db_mapper(_get_repos_cached_initial(config['pylons.app_globals']))
64 repo2db_mapper(_get_repos_cached_initial(config['pylons.app_globals']))
65 set_available_permissions(config)
65 set_available_permissions(config)
66 config['base_path'] = config['pylons.app_globals'].base_path
66 set_base_path(config)
67 # CONFIGURATION OPTIONS HERE (note: all config options will override
67 # CONFIGURATION OPTIONS HERE (note: all config options will override
68 # any Pylons config options)
68 # any Pylons config options)
69
69
@@ -33,10 +33,8 b' def make_app(global_conf, full_stack=Tru'
33 # Configure the Pylons environment
33 # Configure the Pylons environment
34 config = load_environment(global_conf, app_conf)
34 config = load_environment(global_conf, app_conf)
35
35
36
37 # The Pylons WSGI app
36 # The Pylons WSGI app
38 app = PylonsApp(config=config)
37 app = PylonsApp(config=config)
39
40
38
41 # Routing/Session/Cache Middleware
39 # Routing/Session/Cache Middleware
42 app = RoutesMiddleware(app, config['routes.map'])
40 app = RoutesMiddleware(app, config['routes.map'])
General Comments 0
You need to be logged in to leave comments. Login now