From 1c53efec62d5f3ca156b8c5e737d77e22915c9aa Mon Sep 17 00:00:00 2001 From: Nicholas Staples Date: Thu, 7 Apr 2016 17:33:30 +0100 Subject: [PATCH] Update config. All tests passing. --- config.py | 6 ++++-- config_live.py | 1 + config_staging.py | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index beec9c652..b8971c7f8 100644 --- a/config.py +++ b/config.py @@ -35,8 +35,7 @@ class Config(object): SHOW_STYLEGUIDE = True TOKEN_MAX_AGE_SECONDS = 3600 WTF_CSRF_ENABLED = True - CSV_UPLOAD_BUCKET_NAME = '{}-notifications-csv-upload'.format( - os.environ['NOTIFY_ADMIN_ENVIRONMENT'].split('config.')[1].lower()) + CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload' EMAIL_DOMAIN_REGEXES = [ "gov\.uk", @@ -56,15 +55,18 @@ class Development(Config): REMEMBER_COOKIE_SECURE = False SESSION_COOKIE_SECURE = False WTF_CSRF_ENABLED = False + CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload' class Test(Development): DEBUG = True + CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload' class Preview(Config): HTTP_PROTOCOL = 'https' HEADER_COLOUR = '#F47738' # $orange + CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload' configs = { diff --git a/config_live.py b/config_live.py index 2856db0d4..a9f53f54b 100644 --- a/config_live.py +++ b/config_live.py @@ -10,3 +10,4 @@ class Live(Config): ADMIN_CLIENT_SECRET = os.environ['LIVE_ADMIN_CLIENT_SECRET'] SECRET_KEY = os.environ['LIVE_SECRET_KEY'] DANGEROUS_SALT = os.environ['LIVE_DANGEROUS_SALT'] + CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' diff --git a/config_staging.py b/config_staging.py index 00870c2dd..58966324d 100644 --- a/config_staging.py +++ b/config_staging.py @@ -9,3 +9,4 @@ class Staging(Config): ADMIN_CLIENT_SECRET = os.environ['STAGING_ADMIN_CLIENT_SECRET'] SECRET_KEY = os.environ['STAGING_SECRET_KEY'] DANGEROUS_SALT = os.environ['STAGING_DANGEROUS_SALT'] + CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload'