Updates to example project to run on a demo server.

mlavin · mlavin · commit 77637b5d3ea9 · 2014-11-15T15:53:27.000-05:00
diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: gunicorn example.wsgi --log-file=-
diff --git a/example/db.sqlite3 b/example/db.sqlite3
diff --git a/example/example/settings.py b/example/example/settings.py
@@ -1,21 +1,18 @@
 # Django settings for example project.
-import json
 import os
+import dj_database_url
+
 
 BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
 
-DEBUG = True
+DEBUG = os.environ.get('DEBUG', 'on') == 'on'
+
 TEMPLATE_DEBUG = DEBUG
 
+ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '').split(';')
+
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'allaccess',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
+    'default': dj_database_url.config(default='postgres:///allaccess'),
 }
 
 # Local time zone for this installation. Choices can be found here:
@@ -25,7 +22,7 @@
 # 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/Chicago'
+TIME_ZONE = 'UTC'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -55,7 +52,7 @@
 # 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 = ''
+STATIC_ROOT = os.path.join(BASE_DIR, os.pardir, 'static')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
@@ -69,16 +66,10 @@
     os.path.join(BASE_DIR, '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',
-)
-
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = '&amp;k9%jt6ozi$7o+xalyhx9=^e6+*mtb*s9)crr9mhp=ti8utykl'
+DEFAULT_SECRET_KEY = '&amp;k9%jt6ozi$7o+xalyhx9=^e6+*mtb*s9)crr9mhp=ti8utykl'
+
+SECRET_KEY = os.environ.get('SECRET_KEY', DEFAULT_SECRET_KEY)
 
 
 MIDDLEWARE_CLASSES = (
diff --git a/example/example/urls.py b/example/example/urls.py
@@ -1,23 +1,12 @@
-from django.conf.urls import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
+from django.conf.urls import include, url
 from django.contrib import admin
-admin.autodiscover()
 
 from .views import home
 
 
-urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'example.views.home', name='home'),
-    # url(r'^example/', include('example.foo.urls')),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
+urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
     url(r'^accounts/', include('allaccess.urls')),
     url(r'^logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
     url(r'^$', home, name='home'),
-)
+]
diff --git a/example/requirements.txt b/example/requirements.txt
diff --git a/example/templates/home.html b/example/templates/home.html
@@ -1,4 +1,4 @@
-{% load url from future %}
+{% load staticfiles %}
 <!DOCTYPE html>
 <html lang="en" class="no-js">
 <head>
@@ -8,7 +8,7 @@
     <meta name="description" content="{% block meta-description %}{% endblock %}">
     <meta name="author" content="{% block meta-author %}{% endblock %}">
     <meta name="keywords" content="{% block meta-keywords %}{% endblock %}">
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/site.css">
+    <link rel="stylesheet" href="{% static 'css/site.css' %}">
 </head>
 <body id="{% block body-id %}body{% endblock %}" class="{% block body-class %}body{% endblock %}">
     <div class="main">
@@ -34,7 +34,5 @@ <h2 class="heading">django-all-access Demo</h2>
         {% endif %}
     </div>
     <a href="https://github.com/mlavin/django-all-access"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-    {% block extra-js %}{% endblock %}
 </body>
 </html>
diff --git a/example/wsgi.py b/example/wsgi.py
@@ -21,8 +21,6 @@
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
 from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
+from dj_static import Cling
 
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)
+application = Cling(get_wsgi_application())
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,11 @@
+# Deployment requirements
+django-all-access==0.7
+requests-oauthlib==0.4.2
+requests==2.4.3
+oauthlib==0.7.2
+Django==1.7.1
+gunicorn>=19.1,<19.2
+dj-database-url==0.3.0
+dj-static==0.0.6
+static3==0.5.1
+psycopg2==2.5.4

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+web: gunicorn example.wsgi --log-file=-`