Merge "Limit User Booking Length and Extensions"

[pharos-tools.git] / dashboard / src / pharos_dashboard / settings.py

diff --git a/dashboard/src/pharos_dashboard/settings.py b/dashboard/src/pharos_dashboard/settings.py
index 240f68e..07e3920 100644 (file)
--- a/dashboard/src/pharos_dashboard/settings.py
+++ b/dashboard/src/pharos_dashboard/settings.py
@@ -5,7 +5,9 @@ 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 = True
+# NOTE: os.environ only returns strings, so making a comparison to
+# 'True' here will convert it to the correct Boolean value.
+DEBUG = os.environ['DEBUG'] == 'True'
 
 # Application definition
 
@@ -168,6 +170,9 @@ RABBITMQ_PASSWORD = os.environ['RABBITMQ_PASSWORD']
 
 BROKER_URL = 'amqp://' + RABBITMQ_USER + ':' + RABBITMQ_PASSWORD + '@rabbitmq:5672//'
 
+BOOKING_EXP_TIME = os,environ['BOOKING_EXPIRE_TIME']
+BOOKING_MAX_NUM = os.environ['BOOKING_MAXIMUM_NUMBER']
+
 CELERYBEAT_SCHEDULE = {
     'sync-jenkins': {
         'task': 'jenkins.tasks.sync_jenkins',
@@ -181,6 +186,10 @@ CELERYBEAT_SCHEDULE = {
         'task': 'dashboard.tasks.database_cleanup',
         'schedule': timedelta(hours=24)
     },
+    'booking_cleanup': {
+        'task': 'dashboard.tasks.booking_cleanup',
+        'schedule': timedelta(hours=24)
+    },
 }
 # Jenkins Settings
 ALL_SLAVES_URL = os.environ['JENKINS_URL'] + '/computer/api/json?tree=computer[displayName,offline,idle]'
@@ -194,3 +203,4 @@ EMAIL_PORT = os.environ['EMAIL_PORT']
 EMAIL_HOST_USER = os.environ['EMAIL_HOST_USER']
 EMAIL_HOST_PASSWORD = os.environ['EMAIL_HOST_PASSWORD']
 EMAIL_USE_TLS=True
+DEFAULT_EMAIL_FROM = os.environ.get('DEFAULT_EMAIL_FROM', 'webmaster@localhost')