Permalink
Browse files

Don't require config via environment variables.

  • Loading branch information...
1 parent 7e4cfb0 commit 722374afed2fec4b070299158ab5d48ce4b03613 @carljm committed May 19, 2012
Showing with 265 additions and 252 deletions.
  1. +1 −0 .gitignore
  2. +4 −3 datazilla/controller/admin/populate_summary_cache.py
  3. +8 −14 datazilla/model/sql/model.py
  4. 0 datazilla/settings/__init__.py
  5. +5 −0 datazilla/settings/appengine.py
  6. +175 −0 datazilla/settings/base.py
  7. +26 −0 datazilla/settings/local.sample.py
  8. +2 −2 datazilla/webapp/conf/etc/nginx/conf.d/datazilla.conf
  9. +0 −189 datazilla/webapp/settings.py
  10. BIN datazilla/webapp/{media → static}/css/Aristo/images/bg_fallback.png
  11. BIN datazilla/webapp/{media → static}/css/Aristo/images/icon_sprite.png
  12. BIN datazilla/webapp/{media → static}/css/Aristo/images/progress_bar.gif
  13. BIN datazilla/webapp/{media → static}/css/Aristo/images/slider_handles.png
  14. BIN datazilla/webapp/{media → static}/css/Aristo/images/ui-icons_222222_256x240.png
  15. BIN datazilla/webapp/{media → static}/css/Aristo/images/ui-icons_454545_256x240.png
  16. 0 datazilla/webapp/{media → static}/css/Aristo/jquery-ui-1.8.7.custom.css
  17. +1 −1 datazilla/webapp/{media → static}/css/ColVisAlt.css
  18. 0 datazilla/webapp/{media → static}/css/common.css
  19. 0 datazilla/webapp/{media → static}/css/datatables.css
  20. +4 −4 datazilla/webapp/{media → static}/css/dataviews.css
  21. 0 datazilla/webapp/{media → static}/css/fg.menu.css
  22. 0 datazilla/webapp/{media → static}/html/control_panels/named_fields.html
  23. 0 datazilla/webapp/{media → static}/html/control_panels/test_selector.html
  24. 0 datazilla/webapp/{media → static}/html/nav_menu.html
  25. BIN datazilla/webapp/{media → static}/images/back_disabled.jpg
  26. BIN datazilla/webapp/{media → static}/images/back_enabled.jpg
  27. BIN datazilla/webapp/{media → static}/images/background.png
  28. BIN datazilla/webapp/{media → static}/images/bhview_panel.png
  29. BIN datazilla/webapp/{media → static}/images/col_button.png
  30. BIN datazilla/webapp/{media → static}/images/dataview1.png
  31. BIN datazilla/webapp/{media → static}/images/dino3.png
  32. BIN datazilla/webapp/{media → static}/images/forward_disabled.jpg
  33. BIN datazilla/webapp/{media → static}/images/forward_enabled.jpg
  34. BIN datazilla/webapp/{media → static}/images/sort_asc.png
  35. BIN datazilla/webapp/{media → static}/images/sort_asc_disabled.png
  36. BIN datazilla/webapp/{media → static}/images/sort_both.png
  37. BIN datazilla/webapp/{media → static}/images/sort_desc.png
  38. BIN datazilla/webapp/{media → static}/images/sort_desc_disabled.png
  39. BIN datazilla/webapp/{media → static}/images/spinner.gif
  40. BIN datazilla/webapp/{media → static}/images/title.png
  41. 0 datazilla/webapp/{media → static}/js/data_views/Bases.js
  42. 0 datazilla/webapp/{media → static}/js/data_views/ConnectionsComponent.js
  43. 0 datazilla/webapp/{media → static}/js/data_views/DataAdapterCollection.js
  44. 0 datazilla/webapp/{media → static}/js/data_views/DataViewCollection.js
  45. +2 −2 datazilla/webapp/{media → static}/js/data_views/DataViewComponent.js
  46. 0 datazilla/webapp/{media → static}/js/data_views/DataViewPage.js
  47. 0 datazilla/webapp/{media → static}/js/data_views/HelpPage.js
  48. 0 datazilla/webapp/{media → static}/js/data_views/VisualizationCollection.js
  49. 0 datazilla/webapp/{media → static}/js/plugins/box.js
  50. 0 datazilla/webapp/{media → static}/js/plugins/d3.v2.js
  51. 0 datazilla/webapp/{media → static}/js/plugins/d3.v2.min.js
  52. 0 datazilla/webapp/{media → static}/js/plugins/datatables/ColReorderWithResize.js
  53. 0 datazilla/webapp/{media → static}/js/plugins/datatables/ColVis.js
  54. 0 datazilla/webapp/{media → static}/js/plugins/datatables/jquery.dataTables.js
  55. 0 datazilla/webapp/{media → static}/js/plugins/datatables/jquery.dataTables.min.js
  56. 0 datazilla/webapp/{media → static}/js/plugins/fg.menu.js
  57. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/API.txt
  58. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/FAQ.txt
  59. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/LICENSE.txt
  60. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/Makefile
  61. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/NEWS.txt
  62. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/PLUGINS.txt
  63. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/README.txt
  64. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/ajax.html
  65. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/annotating.html
  66. BIN datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-down.gif
  67. BIN datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-left.gif
  68. BIN datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-right.gif
  69. BIN datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-up.gif
  70. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/basic.html
  71. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-1.json
  72. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-2.json
  73. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-3.json
  74. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-4.json
  75. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-5.json
  76. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth.json
  77. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-japan-gdp-growth.json
  78. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-usa-gdp-growth.json
  79. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/graph-types.html
  80. BIN datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/hs-2004-27-a-large_web.jpg
  81. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/image.html
  82. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/index.html
  83. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/interacting-axes.html
  84. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/interacting.html
  85. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/layout.css
  86. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/multiple-axes.html
  87. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/navigate.html
  88. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/percentiles.html
  89. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/pie.html
  90. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/realtime.html
  91. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/resize.html
  92. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/selection.html
  93. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/setting-options.html
  94. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/stacking.html
  95. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/symbols.html
  96. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/thresholding.html
  97. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/time.html
  98. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/tracking.html
  99. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/turning-series.html
  100. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/visitors.html
  101. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/zooming.html
  102. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/excanvas.js
  103. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/excanvas.min.js
  104. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.colorhelpers.js
  105. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.colorhelpers.min.js
  106. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.axislabels.js
  107. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.crosshair.js
  108. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.crosshair.min.js
  109. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.fillbetween.js
  110. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js
  111. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.image.js
  112. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.image.min.js
  113. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.js
  114. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.min.js
  115. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.navigate.js
  116. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.navigate.min.js
  117. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.orderBars.js
  118. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.pie.js
  119. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.pie.min.js
  120. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.resize.js
  121. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.resize.min.js
  122. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.selection.js
  123. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.selection.min.js
  124. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.stack.js
  125. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.stack.min.js
  126. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.symbol.js
  127. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.symbol.min.js
  128. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.threshold.js
  129. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.threshold.min.js
  130. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.js
  131. 0 datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.min.js
  132. 0 datazilla/webapp/{media → static}/js/plugins/jquery-1.6.3.min.js
  133. 0 datazilla/webapp/{media → static}/js/plugins/jquery-ui-1.8.13.custom.min.js
  134. 0 datazilla/webapp/{media → static}/js/plugins/jquery.dataTables.min.js
  135. 0 datazilla/webapp/{media → static}/js/plugins/jquery.flot.text.js
  136. 0 datazilla/webapp/{media → static}/js/plugins/jquery.url.js
  137. 0 datazilla/webapp/{media → static}/js/plugins/json2.js
  138. 0 datazilla/webapp/{media → static}/js/plugins/moo4q/Source/Class.Mutators.jQuery.js
  139. 0 datazilla/webapp/{media → static}/js/plugins/mootools-core-1.4.0.js
  140. 0 datazilla/webapp/{media → static}/js/plugins/underscore-min.js
  141. +29 −29 datazilla/webapp/templates/graphs.views.html
  142. +7 −7 datazilla/webapp/templates/help/dataview.generic.help.html
  143. +1 −1 manage.py
View
@@ -1,2 +1,3 @@
*.pyc
htmlcov/
+datazilla/settings/local.py
@@ -1,11 +1,12 @@
import os
import sys
-import time
-import datetime
import json
import memcache
import zlib
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "datazilla.settings.base")
+from django.conf import settings
+
from optparse import OptionParser
from datazilla.model.DatazillaModel import DatazillaModel
@@ -24,7 +25,7 @@ def cacheTestSummaries(project):
gm = DatazillaModel(project, 'graphs.json')
dataIter = gm.getAllSummaryCache()
- mc = memcache.Client([os.environ["DATAZILLA_MEMCACHED"]], debug=0)
+ mc = memcache.Client([settings.DATAZILLA_MEMCACHED], debug=0)
for d in dataIter:
for data in d:
@@ -7,6 +7,8 @@
import os
import re
+from django.conf import settings
+
from datasource.bases.BaseHub import BaseHub
from datasource.hubs.MySQL import MySQL
@@ -24,16 +26,11 @@ def loadvars():
#####
if not Model.projectHub:
- Model.DATAZILLA_DATABASE_NAME = \
- os.environ["DATAZILLA_DATABASE_NAME"]
- Model.DATAZILLA_DATABASE_USER = \
- os.environ["DATAZILLA_DATABASE_USER"]
- Model.DATAZILLA_DATABASE_PASSWORD = \
- os.environ["DATAZILLA_DATABASE_PASSWORD"]
- Model.DATAZILLA_DATABASE_HOST = \
- os.environ["DATAZILLA_DATABASE_HOST"]
- Model.DATAZILLA_DATABASE_PORT = \
- os.environ["DATAZILLA_DATABASE_PORT"]
+ Model.DATAZILLA_DATABASE_NAME = settings.DATAZILLA_DATABASE_NAME
+ Model.DATAZILLA_DATABASE_USER = settings.DATAZILLA_DATABASE_USER
+ Model.DATAZILLA_DATABASE_PASSWORD = settings.DATAZILLA_DATABASE_PASSWORD
+ Model.DATAZILLA_DATABASE_HOST = settings.DATAZILLA_DATABASE_HOST
+ Model.DATAZILLA_DATABASE_PORT = settings.DATAZILLA_DATABASE_PORT
####
#Configuration of datasource hub:
@@ -92,10 +89,7 @@ def __init__(self, project, sqlFileName):
self.project = project
self.sqlFileName = sqlFileName
- try:
- self.DEBUG = os.environ["DATAZILLA_DEBUG"] is not None
- except KeyError:
- self.DEBUG = False
+ self.DEBUG = settings.DEBUG
#####
#Set the hub to the requested project
No changes.
@@ -0,0 +1,5 @@
+TEMPLATE_LOADERS = [
+ 'django.template.loaders.filesystem.load_template_source',
+]
+
+MIDDLEWARE_CLASSES = []
View
@@ -0,0 +1,175 @@
+# Django settings for webapp project.
+import os, posixpath
+
+USE_APP_ENGINE = "APPENGINE_RUNTIME" in os.environ
+
+# These settings can all be optionally set via env vars, or in local.py:
+
+# Set Database connectivity via environment
+DATAZILLA_DATABASE_NAME = os.environ.get("DATAZILLA_DATABASE_NAME", "")
+DATAZILLA_DATABASE_USER = os.environ.get("DATAZILLA_DATABASE_USER", "")
+DATAZILLA_DATABASE_PASSWORD = os.environ.get("DATAZILLA_DATABASE_PASSWORD", "")
+DATAZILLA_DATABASE_HOST = os.environ.get("DATAZILLA_DATABASE_HOST", "")
+DATAZILLA_DATABASE_PORT = os.environ.get("DATAZILLA_DATABASE_PORT", "")
+
+DATAZILLA_MEMCACHED = os.environ.get("DATAZILLA_MEMCACHED", "")
+
+# Set base URL via the environment
+DATAZILLA_URL = os.environ.get("DATAZILLA_URL", "/")
+
+DEBUG = os.environ.get("DATAZILLA_DEBUG") is not None
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = os.environ.get("DATAZILLA_DJANGO_SECRET_KEY", "")
+
+
+ROOT = os.path.dirname(
+ os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+path = lambda *a: os.path.join(ROOT, *a)
+
+ADMINS = [
+ ("jeads", "jeads@mozilla.com"),
+ ("Carl Meyer", "cmeyer@mozilla.com"),
+]
+
+MANAGERS = ADMINS
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = "America/Los_Angeles"
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = "en-us"
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = False
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale
+USE_L10N = True
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+#STATIC_ROOT = path("datazilla/webapp/collected-assets")
+
+# Additional locations of static files
+STATICFILES_DIRS = [
+ # Put strings here, like "/home/html/static" or "C:/www/django/static".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+ path("datazilla/webapp/static"),
+]
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = [
+ "django.contrib.staticfiles.finders.FileSystemFinder",
+ "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+# "django.contrib.staticfiles.finders.DefaultStorageFinder",
+]
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = [
+ "django.template.loaders.filesystem.Loader",
+ "django.template.loaders.app_directories.Loader",
+ "django.template.loaders.eggs.Loader",
+]
+
+MIDDLEWARE_CLASSES = [
+ "django.middleware.common.CommonMiddleware",
+ "django.contrib.sessions.middleware.SessionMiddleware",
+ "django.contrib.auth.middleware.AuthenticationMiddleware",
+ "django.contrib.messages.middleware.MessageMiddleware",
+]
+
+ROOT_URLCONF = "datazilla.webapp.urls"
+
+TEMPLATE_DIRS = [
+ path("datazilla/webapp/templates")
+]
+
+INSTALLED_APPS = [
+ #"django.contrib.auth",
+ #"django.contrib.contenttypes",
+ #"django.contrib.sessions",
+ #"django.contrib.sites",
+ #"django.contrib.messages",
+ #"django.contrib.staticfiles",
+ # Uncomment the next line to enable the admin:
+ # "django.contrib.admin",
+ # Uncomment the next line to enable admin documentation:
+ # "django.contrib.admindocs",
+
+ "datazilla.webapp.apps.datazilla",
+]
+
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+ "version": 1,
+ "disable_existing_loggers": False,
+ "handlers": {
+ "mail_admins": {
+ "level": "ERROR",
+ "class": "django.utils.log.AdminEmailHandler"
+ }
+ },
+ "loggers": {
+ "django.request": {
+ "handlers": ["mail_admins"],
+ "level": "ERROR",
+ "propagate": True,
+ },
+ }
+}
+
+# Import app-engine specific settings, if appropriate
+if USE_APP_ENGINE:
+ from .appengine import *
+
+# Import local settings to add to/override the above
+try:
+ from .local import *
+except ImportError:
+ pass
+
+# Derived settings, whose values should vary with local settings:
+
+TEMPLATE_DEBUG = DEBUG
+
+# The URL static assets will be served at.
+STATIC_URL = posixpath.join(DATAZILLA_URL, "static")
+
+CACHES = {
+ "default": {
+ "BACKEND": "django.core.cache.backends.memcached.MemcachedCache",
+ "LOCATION": DATAZILLA_MEMCACHED,
+ }
+}
+
+if not USE_APP_ENGINE:
+ DATABASES = {
+ "default": {
+ "ENGINE" : "django.db.backends.mysql", # Add "postgresql_psycopg2", "postgresql", "mysql", "sqlite3" or "oracle".
+ "NAME" : DATAZILLA_DATABASE_NAME, # Or path to database file if using sqlite3.
+ "USER" : DATAZILLA_DATABASE_USER, # Not used with sqlite3.
+ "PASSWORD" : DATAZILLA_DATABASE_PASSWORD, # Not used with sqlite3.
+ "HOST" : DATAZILLA_DATABASE_HOST, # Set to empty string for localhost. Not used with sqlite3.
+ "PORT" : DATAZILLA_DATABASE_PORT, # Set to empty string for default. Not used with sqlite3.
+ }
+ }
+
@@ -0,0 +1,26 @@
+"""
+Sample Datazilla local-settings.
+
+Copy this file to ``local.py`, then uncomment and modify the below settings as
+needed for your configuration.
+
+"""
+import os
+
+# Database connection parameters
+DATAZILLA_DATABASE_NAME = os.environ.get("DATAZILLA_DATABASE_NAME", "")
+DATAZILLA_DATABASE_USER = os.environ.get("DATAZILLA_DATABASE_USER", "")
+DATAZILLA_DATABASE_PASSWORD = os.environ.get("DATAZILLA_DATABASE_PASSWORD", "")
+DATAZILLA_DATABASE_HOST = os.environ.get("DATAZILLA_DATABASE_HOST", "")
+DATAZILLA_DATABASE_PORT = os.environ.get("DATAZILLA_DATABASE_PORT", "")
+
+DATAZILLA_MEMCACHED = os.environ.get("DATAZILLA_MEMCACHED", "")
+
+# base URL
+DATAZILLA_URL = os.environ.get("DATAZILLA_URL", "/")
+
+# This should always be False in production
+DEBUG = os.environ.get("DATAZILLA_DEBUG") is not None
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = os.environ["DATAZILLA_DJANGO_SECRET_KEY"]
@@ -4,10 +4,10 @@ server {
access_log /var/log/nginx/datazilla.access.log;
error_log /var/log/nginx/datazilla.error.log;
- location ^~ /media/ {
+ location ^~ /static/ {
index index.html
client_max_body_size 1G;
- alias /usr/local/datazilla/datazilla/webapp/media/;
+ alias /usr/local/datazilla/datazilla/webapp/static/;
}
location ^~ /htmlcov {
Oops, something went wrong.

0 comments on commit 722374a

Please sign in to comment.