File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ full-clean: clean
3131 $(call ssh_all,'sudo docker rmi deis/controller')
3232
3333test :
34- python manage.py test --noinput api web
34+ python manage.py test --noinput api
3535
3636runserver :
3737 python manage.py runserver
4040 python manage.py syncdb --migrate --noinput
4141
4242coverage :
43- coverage run manage.py test --noinput api web
43+ coverage run manage.py test --noinput api
4444 coverage html
4545
4646flake8 :
Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ etcd_safe_set protocol ${DEIS_PROTOCOL:-http}
3434etcd_safe_set secretKey ${DEIS_SECRET_KEY:- `openssl rand -base64 64 | tr -d ' \n' `}
3535etcd_safe_set builderKey ${DEIS_BUILDER_KEY:- `openssl rand -base64 64 | tr -d ' \n' `}
3636etcd_safe_set registrationEnabled 1
37+ etcd_safe_set webEnabled 0
3738
3839# wait for confd to run once and install initial templates
3940until confd -onetime -node $ETCD -config-file /app/confd.toml 2> /dev/null; do
Original file line number Diff line number Diff line change 283283# check if we can register users with `deis register`
284284REGISTRATION_ENABLED = True
285285
286+ # check if we should enable the web UI module
287+ WEB_ENABLED = False
288+
286289# default to sqlite3, but allow postgresql config through envvars
287290DATABASES = {
288291 'default' : {
Original file line number Diff line number Diff line change 77
88from __future__ import unicode_literals
99
10+ from django .conf import settings
1011from django .conf .urls import patterns , include , url
1112from django .contrib import admin
1213
1920 url (r'^accounts/' , include ('allauth.urls' )),
2021 url (r'^admin/' , include (admin .site .urls )),
2122 url (r'^api/' , include ('api.urls' )),
22- url (r'^' , include ('web.urls' )),
2323)
24+
25+ if settings .WEB_ENABLED :
26+ urlpatterns += patterns ('' , url (r'^' , include ('web.urls' )))
Original file line number Diff line number Diff line change 2828{{ if .deis_controller_registrationEnabled }}
2929REGISTRATION_ENABLED = bool ({{ .deis_controller_registrationEnabled }})
3030{{ end }}
31+
32+ {{ if .deis_controller_webEnabled }}
33+ WEB_ENABLED = bool ({{ .deis_controller_webEnabled }})
34+ {{ end }}
You can’t perform that action at this time.
0 commit comments