Merge pull request #202 from helgi/remove_web

ref(web): remove web 'app' from django

Author: helgi

Makefile

@@ -88,7 +88,7 @@ test-style:
 
 test-unit:
 	cd rootfs \
-		&& coverage run manage.py test --noinput web registry api \
+		&& coverage run manage.py test --noinput registry api \
 		&& coverage report -m
 
 test-functional:

rootfs/deis/settings.py

@@ -121,14 +121,6 @@
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'deis.wsgi.application'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates"
-    # or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    PROJECT_ROOT + '/web/templates',
-)
-
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
@@ -150,7 +142,6 @@
     # Deis apps
     'api',
     'registry',
-    'web',
 )
 
 AUTHENTICATION_BACKENDS = (
@@ -324,9 +315,6 @@
 # check if we can register users with `deis register`
 REGISTRATION_ENABLED = True
 
-# check if we should enable the web UI module
-WEB_ENABLED = False
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',

rootfs/deis/urls.py

@@ -7,7 +7,6 @@
 
 from __future__ import unicode_literals
 
-from django.conf import settings
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from api.views import HealthCheckView
@@ -21,10 +20,3 @@
     url(r'^health-check$', HealthCheckView.as_view()),
     url(r'^v2/', include('api.urls')),
 )
-
-if settings.WEB_ENABLED:
-    urlpatterns += patterns(
-        '',
-        url(r'^', include('web.urls')),
-        url(r'^admin/', include(admin.site.urls)),
-    )

rootfs/templates/confd_settings.py

@@ -17,10 +17,6 @@
 REGISTRATION_MODE = '{{ getv "/deis/controller/registrationMode" }}'
 {{ end }}
 
-{{ if exists "/deis/controller/webEnabled" }}
-WEB_ENABLED = bool({{ getv "/deis/controller/webEnabled" }})
-{{ end }}
-
 {{ if exists "/deis/controller/subdomain" }}
 DEIS_RESERVED_NAMES = ['{{ getv "/deis/controller/subdomain" }}']
 {{ end }}