Skip to content

Commit bb0c3ec

Browse files
committed
ref(rootfs): remove static WSGI app
Static files aren't served since the web app is gone and the admin app is disabled.
1 parent 0b29c22 commit bb0c3ec

3 files changed

Lines changed: 4 additions & 30 deletions

File tree

rootfs/.coveragerc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ omit =
66
api/__init__.py
77
api/docker.py
88
scheduler/*
9-
web/__init__.py
10-
web/models.py
11-
web/templatetags/__init__.py
129
# osx library files when not running in virtualenv
1310
/Library/*
1411
/System/*
@@ -27,5 +24,4 @@ exclude_lines =
2724
if __name__ == .__main__.:
2825

2926
[html]
30-
extra_css = web/static/css/main.css
3127
title = Deis Coverage Report

rootfs/deis/wsgi.py

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,16 @@
11
"""
22
WSGI config for deis project.
33
4-
This module contains the WSGI application used by Django's development server
5-
and any production WSGI deployments. It should expose a module-level variable
6-
named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
7-
this application via the ``WSGI_APPLICATION`` setting.
4+
It exposes the WSGI callable as a module-level variable named ``application``.
85
6+
For more information on this file, see
7+
https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
98
"""
109

1110
import os
1211

1312
from django.core.wsgi import get_wsgi_application
14-
import static
15-
1613

1714
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "deis.settings")
1815

19-
20-
class Dispatcher(object):
21-
"""
22-
Dispatches requests between two WSGI apps, a static file server and a
23-
Django server.
24-
"""
25-
26-
def __init__(self):
27-
self.django_handler = get_wsgi_application()
28-
self.static_handler = static.Cling(os.path.dirname(os.path.dirname(__file__)))
29-
30-
def __call__(self, environ, start_response):
31-
if environ['PATH_INFO'].startswith('/static'):
32-
return self.static_handler(environ, start_response)
33-
else:
34-
return self.django_handler(environ, start_response)
35-
36-
37-
application = Dispatcher()
16+
application = get_wsgi_application()

rootfs/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ python-etcd==0.3.2
1212
PyYAML==3.11
1313
requests==2.9.1
1414
simpleflock==0.0.3
15-
static==1.1.1
1615
morph==0.1.2

0 commit comments

Comments
 (0)