|
a/Allura/allura/config/middleware.py |
|
b/Allura/allura/config/middleware.py |
|
... |
|
... |
| 77 |
# make_base_app = base_config.setup_tg_wsgi_app(load_environment)
|
77 |
# make_base_app = base_config.setup_tg_wsgi_app(load_environment)
|
| 78 |
# app = make_base_app(global_conf, full_stack=True, **app_conf)
|
78 |
# app = make_base_app(global_conf, full_stack=True, **app_conf)
|
| 79 |
|
79 |
|
| 80 |
# Configure the Pylons environment
|
80 |
# Configure the Pylons environment
|
| 81 |
load_environment(global_conf, app_conf)
|
81 |
load_environment(global_conf, app_conf)
|
|
|
82 |
|
|
|
83 |
if config.get('zarkov.host'):
|
|
|
84 |
try:
|
|
|
85 |
from zarkov import client as zclient
|
|
|
86 |
except ImportError, e:
|
|
|
87 |
raise ImportError, "Unable to import the zarkov library. Please"\
|
|
|
88 |
" check that zarkov is installed or comment out"\
|
|
|
89 |
" the zarkov.host setting in your ini file."
|
| 82 |
|
90 |
|
| 83 |
app = tg.TGApp()
|
91 |
app = tg.TGApp()
|
| 84 |
if asbool(config.get('auth.method', 'local')=='sfx'):
|
92 |
if asbool(config.get('auth.method', 'local')=='sfx'):
|
| 85 |
import sfx.middleware
|
93 |
import sfx.middleware
|
| 86 |
d = h.config_with_prefix(config, 'auth.')
|
94 |
d = h.config_with_prefix(config, 'auth.')
|