summaryrefslogtreecommitdiffstats
path: root/pharos-dashboard/src/pharos_dashboard
diff options
context:
space:
mode:
authormaxbr <maxbr@mi.fu-berlin.de>2017-05-05 10:02:56 +0200
committermaxbr <maxbr@mi.fu-berlin.de>2017-05-05 10:28:14 +0200
commit2235d14f060327066ea035288ca97994c41fc65a (patch)
tree11fbc9a7a5d8083c2e1903c44aa4d146310ff49d /pharos-dashboard/src/pharos_dashboard
parent6a821ea00a481bd77a8522f8b7145b8d7ce35d7f (diff)
Pharos Dashboard: Add manual resource management
Dev Pods are now managed by checking the "Dev pod" box in the Admin Panel. This commit also fixes a dead image URL and the oauth process for the dashboard URL. Change-Id: Ic94160eb3a4504a369606261440df0e5354ac027 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'pharos-dashboard/src/pharos_dashboard')
-rw-r--r--pharos-dashboard/src/pharos_dashboard/settings.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/pharos-dashboard/src/pharos_dashboard/settings.py b/pharos-dashboard/src/pharos_dashboard/settings.py
index 084f878..546b174 100644
--- a/pharos-dashboard/src/pharos_dashboard/settings.py
+++ b/pharos-dashboard/src/pharos_dashboard/settings.py
@@ -5,7 +5,7 @@ from datetime import timedelta
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
# Application definition
@@ -157,13 +157,16 @@ OAUTH_REQUEST_TOKEN_URL = JIRA_URL + '/plugins/servlet/oauth/request-token'
OAUTH_ACCESS_TOKEN_URL = JIRA_URL + '/plugins/servlet/oauth/access-token'
OAUTH_AUTHORIZE_URL = JIRA_URL + '/plugins/servlet/oauth/authorize'
-OAUTH_CALLBACK_URL = JIRA_URL + '/accounts/authenticated'
+OAUTH_CALLBACK_URL = os.environ['DASHBOARD_URL'] + '/accounts/authenticated'
# Celery Settings
CELERY_TIMEZONE = 'UTC'
RABBITMQ_URL = 'rabbitmq'
-BROKER_URL = 'amqp://guest:guest@rabbitmq:5672//'
+RABBITMQ_USER = os.environ['RABBITMQ_USER']
+RABBITMQ_PASSWORD = os.environ['RABBITMQ_PASSWORD']
+
+BROKER_URL = 'amqp://' + RABBITMQ_USER + ':' + RABBITMQ_PASSWORD + '@rabbitmq:5672//'
CELERYBEAT_SCHEDULE = {
'sync-jenkins': {