Merge pull request #310 from mboersma/remove-static

ref(static): remove WSGI app and unused resources

Author: mboersma

rootfs/.coveragerc

@@ -6,9 +6,6 @@ omit =
     api/__init__.py
     api/docker.py
     scheduler/*
-    web/__init__.py
-    web/models.py
-    web/templatetags/__init__.py
     # osx library files when not running in virtualenv
     /Library/*
     /System/*
@@ -27,5 +24,4 @@ exclude_lines =
     if __name__ == .__main__.:
 
 [html]
-extra_css = web/static/css/main.css
 title = Deis Coverage Report

rootfs/Dockerfile

@@ -28,6 +28,4 @@ RUN DOCKER_BUILD=true /app/tmp/build.sh && rm -rf /app/*
 
 ADD . /app
 
-RUN ./manage.py collectstatic --settings=deis.settings --noinput  # create static resources
-
 ENV DEIS_RELEASE 2.0.0-dev

rootfs/api/static/500.html

@@ -57,30 +57,10 @@
 # Examples: "http://example.com/media/", "http://media.example.com/"
 MEDIA_URL = ''
 
-# 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: "/var/www/example.com/static/"
-STATIC_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', 'static'))
-
-# URL prefix for static files.
-# Example: "http://example.com/static/", "http://static.example.com/"
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.9/howto/static-files/
 STATIC_URL = '/static/'
 
-# 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.
-)
-
-# 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',
-)
-
 # Manage templates
 TEMPLATES = [
     {
@@ -96,7 +76,6 @@
                 "django.template.context_processors.i18n",
                 "django.template.context_processors.media",
                 "django.template.context_processors.request",
-                "django.template.context_processors.static",
                 "django.template.context_processors.tz",
                 "django.contrib.messages.context_processors.messages"
             ],
@@ -106,8 +85,9 @@
 
 MIDDLEWARE_CLASSES = (
     'corsheaders.middleware.CorsMiddleware',
-    'django.middleware.common.CommonMiddleware',
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.contrib.sites.middleware.CurrentSiteMiddleware',
@@ -123,21 +103,19 @@
 WSGI_APPLICATION = 'deis.wsgi.application'
 
 INSTALLED_APPS = (
-    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.humanize',
     'django.contrib.messages',
     'django.contrib.sessions',
     'django.contrib.sites',
-    'django.contrib.staticfiles',
     # Third-party apps
+    'corsheaders',
     'guardian',
-    'jsonfield',
     'gunicorn',
+    'jsonfield',
     'rest_framework',
     'rest_framework.authtoken',
-    'corsheaders',
     # Deis apps
     'api'
 )

rootfs/deis/settings.py

@@ -1,37 +1,16 @@
 """
 WSGI config for deis project.
 
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
+It exposes the WSGI callable as a module-level variable named ``application``.
 
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
 """
 
 import os
 
 from django.core.wsgi import get_wsgi_application
-import static
-
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "deis.settings")
 
-
-class Dispatcher(object):
-    """
-    Dispatches requests between two WSGI apps, a static file server and a
-    Django server.
-    """
-
-    def __init__(self):
-        self.django_handler = get_wsgi_application()
-        self.static_handler = static.Cling(os.path.dirname(os.path.dirname(__file__)))
-
-    def __call__(self, environ, start_response):
-        if environ['PATH_INFO'].startswith('/static'):
-            return self.static_handler(environ, start_response)
-        else:
-            return self.django_handler(environ, start_response)
-
-
-application = Dispatcher()
+application = get_wsgi_application()

rootfs/deis/wsgi.py

@@ -4,13 +4,12 @@ Django==1.9.1
 django-cors-headers==1.1.0
 django-guardian==1.3.2
 djangorestframework==3.3.2
-jsonfield==1.0.3
 docker-py==1.6.0
 gunicorn==19.4.1
+jsonfield==1.0.3
+morph==0.1.2
 psycopg2==2.6.1
 python-etcd==0.3.2
 PyYAML==3.11
 requests==2.9.1
 simpleflock==0.0.3
-static==1.1.1
-morph==0.1.2