occi: make occi optional

circle/circle/settings/base.py

@@ -359,9 +359,13 @@ LOCAL_APPS = (
     'manager',
     'manager',
     'acl',
     'acl',
     'monitor',
     'monitor',
+)
+
+if get_env_variable('OCCI', 'FALSE') == 'TRUE':
+    LOCAL_APPS += (
         'voms',
         'voms',
         'occi',
         'occi',
-)
+    )
 
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS

circle/circle/urls.py

@@ -70,7 +70,6 @@ urlpatterns = patterns(
     url(r'^info/support/$',
     url(r'^info/support/$',
         TemplateView.as_view(template_name="info/support.html"),
         TemplateView.as_view(template_name="info/support.html"),
         name="info.support"),
         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')),
         (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'
 handler500 = 'common.views.handler500'