Revert "fix(controller): disable web UI"

This reverts commit eb68a1d.

controller/Makefile

@@ -31,7 +31,7 @@ full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/controller')
 
 test:
-	python manage.py test --noinput api
+	python manage.py test --noinput api web
 
 runserver:
 	python manage.py runserver
@@ -40,7 +40,7 @@ db:
 	python manage.py syncdb --migrate --noinput
 
 coverage:
-	coverage run manage.py test --noinput api
+	coverage run manage.py test --noinput api web
 	coverage html
 
 flake8:

controller/bin/boot

@@ -34,7 +34,6 @@ etcd_safe_set protocol ${DEIS_PROTOCOL:-http}
 etcd_safe_set secretKey ${DEIS_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
 etcd_safe_set builderKey ${DEIS_BUILDER_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
 etcd_safe_set registrationEnabled 1
-etcd_safe_set webEnabled 0
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do

controller/deis/settings.py

@@ -283,9 +283,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
-
 # default to sqlite3, but allow postgresql config through envvars
 DATABASES = {
     'default': {

controller/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
 
@@ -20,7 +19,5 @@
     url(r'^accounts/', include('allauth.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/', include('api.urls')),
+    url(r'^', include('web.urls')),
 )
-
-if settings.WEB_ENABLED:
-    urlpatterns += patterns('', url(r'^', include('web.urls')))

controller/templates/confd_settings.py

@@ -28,7 +28,3 @@
 {{ if .deis_controller_registrationEnabled }}
 REGISTRATION_ENABLED = bool({{ .deis_controller_registrationEnabled }})
 {{ end }}
-
-{{ if .deis_controller_webEnabled }}
-WEB_ENABLED = bool({{ .deis_controller_webEnabled }})
-{{ end }}