diff --git a/cloud/context_processors.py b/cloud/context_processors.py index 0d185d7..c899291 100644 --- a/cloud/context_processors.py +++ b/cloud/context_processors.py @@ -1,12 +1,11 @@ -import json -import subprocess - from django.conf import settings from django.core.cache import cache + def process_debug(req): return {'DEBUG': settings.DEBUG} + def process_stat(req): if settings.STAT_DEBUG: stat = { @@ -28,6 +27,7 @@ def process_stat(req): 'cloud_stat': stat, } + def process_release(req): return { 'release': settings.RELEASE, diff --git a/cloud/settings/dev.py b/cloud/settings/dev.py index 2781ce4..2fa0f91 100644 --- a/cloud/settings/dev.py +++ b/cloud/settings/dev.py @@ -1,6 +1,6 @@ # coding=utf8 # Django development settings for cloud project. -from .base import * +from .base import * # NOQA DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -8,10 +8,10 @@ EMAIL_HOST = "localhost" EMAIL_PORT = 1025 ADMINS = ( - ('Ory, Mate', 'orymate@localhost'), - ) + ('Ory, Mate', 'orymate@localhost'), +) MANAGERS = ( - ('Ory Mate', 'maat@localhost'), - ) + ('Ory Mate', 'maat@localhost'), +) INSTALLED_APPS += ("debug_toolbar", ) MIDDLEWARE_CLASSES += ("debug_toolbar.middleware.DebugToolbarMiddleware", ) diff --git a/cloud/settings/prod.py b/cloud/settings/prod.py index 03a34f4..96859d7 100644 --- a/cloud/settings/prod.py +++ b/cloud/settings/prod.py @@ -1,6 +1,6 @@ # coding=utf8 # Django production settings for cloud project. -from .base import * +from .base import * # NOQA DEBUG = False TEMPLATE_DEBUG = DEBUG diff --git a/cloud/urls.py b/cloud/urls.py index 7768d04..f984b41 100644 --- a/cloud/urls.py +++ b/cloud/urls.py @@ -3,7 +3,7 @@ from django.conf.urls import patterns, include, url from django.contrib import admin admin.autodiscover() -import one.views +# import one.views import firewall_gui.urls # import store.views @@ -11,7 +11,8 @@ js_info_dict = { 'packages': ('one', ), } -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^admin/doc/', include('django.contrib.admindocs.urls'), ), url(r'^admin/', include(admin.site.urls), ), @@ -44,7 +45,8 @@ urlpatterns = patterns('', url(r'^vm/saveas/(?P<vmid>\d+)$', 'one.views.vm_saveas', ), url(r'^vm/credentials/(?P<iid>\d+)$', 'one.views.vm_credentials', ), url(r'^ajax/templateWizard/$', 'one.views.ajax_template_wizard', ), - url(r'^ajax/templateEditWizard/(?P<id>\d+)/$', 'one.views.ajax_template_edit_wizard', ), + url(r'^ajax/templateEditWizard/(?P<id>\d+)/$', + 'one.views.ajax_template_edit_wizard', ), url(r'^ajax/share/(?P<id>\d+)/$', 'one.views.ajax_share_wizard', ), url(r'^ajax/share/(?P<id>\d+)/(?P<gid>\d+)$', 'one.views.ajax_share_wizard', ), diff --git a/cloud/wsgi.py b/cloud/wsgi.py index 3afb395..f8ef480 100644 --- a/cloud/wsgi.py +++ b/cloud/wsgi.py @@ -23,6 +23,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cloud.settings.prod") from django.core.wsgi import get_wsgi_application _application = get_wsgi_application() + def application(environ, start_response): # copy DJANGO_* wsgi-env vars to process-env for i in environ.keys():