Skip to content

Commit 9c7f9e0

Browse files
committed
ref(web): remove web 'app' from django
There is no practical use for this module and in later Django updates (see my other django PRs) there are some slight hoop jumping to do. Any web UI on top of Deis should be built via the APIs
1 parent e0c44c3 commit 9c7f9e0

45 files changed

Lines changed: 1 addition & 1351 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ test-style:
8888

8989
test-unit:
9090
cd rootfs \
91-
&& coverage run manage.py test --noinput web registry api \
91+
&& coverage run manage.py test --noinput registry api \
9292
&& coverage report -m
9393

9494
test-functional:

rootfs/deis/settings.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@
121121
# Python dotted path to the WSGI application used by Django's runserver.
122122
WSGI_APPLICATION = 'deis.wsgi.application'
123123

124-
TEMPLATE_DIRS = (
125-
# Put strings here, like "/home/html/django_templates"
126-
# or "C:/www/django/templates".
127-
# Always use forward slashes, even on Windows.
128-
# Don't forget to use absolute paths, not relative paths.
129-
PROJECT_ROOT + '/web/templates',
130-
)
131-
132124
INSTALLED_APPS = (
133125
'django.contrib.admin',
134126
'django.contrib.auth',
@@ -150,7 +142,6 @@
150142
# Deis apps
151143
'api',
152144
'registry',
153-
'web',
154145
)
155146

156147
AUTHENTICATION_BACKENDS = (
@@ -324,9 +315,6 @@
324315
# check if we can register users with `deis register`
325316
REGISTRATION_ENABLED = True
326317

327-
# check if we should enable the web UI module
328-
WEB_ENABLED = False
329-
330318
DATABASES = {
331319
'default': {
332320
'ENGINE': 'django.db.backends.postgresql_psycopg2',

rootfs/deis/urls.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from __future__ import unicode_literals
99

10-
from django.conf import settings
1110
from django.conf.urls import patterns, include, url
1211
from django.contrib import admin
1312
from api.views import HealthCheckView
@@ -21,10 +20,3 @@
2120
url(r'^health-check$', HealthCheckView.as_view()),
2221
url(r'^v2/', include('api.urls')),
2322
)
24-
25-
if settings.WEB_ENABLED:
26-
urlpatterns += patterns(
27-
'',
28-
url(r'^', include('web.urls')),
29-
url(r'^admin/', include(admin.site.urls)),
30-
)

rootfs/templates/confd_settings.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
REGISTRATION_MODE = '{{ getv "/deis/controller/registrationMode" }}'
1818
{{ end }}
1919

20-
{{ if exists "/deis/controller/webEnabled" }}
21-
WEB_ENABLED = bool({{ getv "/deis/controller/webEnabled" }})
22-
{{ end }}
23-
2420
{{ if exists "/deis/controller/subdomain" }}
2521
DEIS_RESERVED_NAMES = ['{{ getv "/deis/controller/subdomain" }}']
2622
{{ end }}

rootfs/web/__init__.py

Whitespace-only changes.

rootfs/web/fixtures/test_web.json

Lines changed: 0 additions & 66 deletions
This file was deleted.

rootfs/web/models.py

Whitespace-only changes.

rootfs/web/static/css/bootstrap-responsive.min.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

rootfs/web/static/css/bootstrap.min.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

rootfs/web/static/css/deis-controller.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)