Commit 9875c841 by Kálmán Viktor

occi: make occi optional

parent b0eb77fb
......@@ -359,10 +359,14 @@ LOCAL_APPS = (
'manager',
'acl',
'monitor',
'voms',
'occi',
)
if get_env_variable('OCCI', 'FALSE') == 'TRUE':
LOCAL_APPS += (
'voms',
'occi',
)
# See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
########## END APP CONFIGURATION
......
......@@ -70,7 +70,6 @@ urlpatterns = patterns(
url(r'^info/support/$',
TemplateView.as_view(template_name="info/support.html"),
name="info.support"),
url(r'^', include('occi.urls')), # this seems silly
)
......@@ -87,4 +86,12 @@ if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
(r'^saml2/', include('djangosaml2.urls')),
)
if get_env_variable('OCCI', 'FALSE') == 'TRUE':
urlpatterns = patterns(
'',
url(r'^', include('occi.urls')), # this seems silly
)
handler500 = 'common.views.handler500'
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 sign in to comment