From cf8ff5f557de8039ce301c252899b50d32f26f4d Mon Sep 17 00:00:00 2001 From: akkking Date: Wed, 6 Feb 2019 12:41:25 -0500 Subject: [PATCH 1/2] Update config --- app/config/local.default.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/config/local.default.py b/app/config/local.default.py index 6b8f4da..7b7aaf9 100644 --- a/app/config/local.default.py +++ b/app/config/local.default.py @@ -2,7 +2,7 @@ import os SQLALCHEMY_TRACK_MODIFICATIONS = False -SQLALCHEMY_DATABASE_URI = os.environ['SQLALCHEMY_DATABASE_URI'] +SQLALCHEMY_DATABASE_URI = os.environ['BUILDING_SERVICE_DBURI'] REDIS_URI = os.environ['REDIS_URI'] @@ -17,8 +17,8 @@ SERVICE_CONFIG = { 'app_secret': 'x-blocpower-app-secret' }, 'urls': { - 'app': 'http://127.0.0.1:5400', - 'user': 'http://127.0.0.1:5401', + 'app': os.environ['SERVICE_CONFIG_URLS_APP'], + 'user': os.environ['SERVICE_CONFIG_URLS_USER'], } } @@ -26,19 +26,19 @@ SERVICE_CONFIG = { APP_CACHE_EXPIRY = 60 * 60 # One hour. # Auth0 Authentication -AUTH0_AUTH_HEADER = 'x-blocpower-auth0-token' -AUTH0_DOMAIN = '$AUTH0_DOMAIN' -AUTH0_AUDIENCE = '$AUTH0_AUDIENCE' -AUTH0_CLAIMS_NAMESPACE = '$AUTH0_CLAIMS_NAMESPACE' -AUTH0_CLIENT_ID = '$AUTH0_CLIENT_ID' -AUTH0_CLIENT_SECRET = '$AUTH0_CLIENT_SECRET' +AUTH0_AUTH_HEADER = os.environ['AUTH0_AUTH_HEADER'] +AUTH0_DOMAIN = os.environ['AUTH0_DOMAIN'] +AUTH0_AUDIENCE = os.environ['AUTH0_AUDIENCE'] +AUTH0_CLAIMS_NAMESPACE = os.environ['AUTH0_CLAIMS_NAMESPACE'] +AUTH0_CLIENT_ID = os.environ['AUTH0_CLIENT_ID'] +AUTH0_CLIENT_SECRET = os.environ['AUTH0_CLIENT_SECRET'] # Blocpower auth information. -HEADER_AUTH_KEY = 'x-blocpower-auth-key' -HEADER_AUTH_TOKEN = 'x-blocpower-auth-token' +HEADER_AUTH_KEY = os.environ['HEADER_AUTH_KEY'] +HEADER_AUTH_TOKEN = os.environ['HEADER_AUTH_TOKEN'] # Mechanical Turk credentials -AWS_ACCESS_KEY = os.environ['AWS_ACCESS_KEY'] -AWS_SECRET_ACCESS_KEY = os.environ['AWS_SECRET_KEY'] -MECH_TURK_ENDPOINT_URL = os.environ['MECH_TURK_ENDPOINT_URL'] -MECH_TURK_REGION = os.environ['MECH_TURK_REGION'] +AWS_ACCESS_KEY = os.environ['BUILDING_SERVICE_AWS_ACCESS_KEY'] +AWS_SECRET_ACCESS_KEY = os.environ['BUILDING_SERVICE_AWS_SECRET_ACCESS_KEY'] +MECH_TURK_ENDPOINT_URL = os.environ['BUILDING_SERVICE_MECH_TURK_ENDPOINT_URL'] +MECH_TURK_REGION = os.environ['BUILDING_SERVICE_MECH_TURK_REGION'] -- GitLab From 0d84c800730235b4cee662ed856547de686e21d2 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Thu, 7 Feb 2019 15:10:12 -0500 Subject: [PATCH 2/2] Remove prefixes from environment variables. --- app/config/local.default.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/config/local.default.py b/app/config/local.default.py index 7b7aaf9..43bbb0b 100644 --- a/app/config/local.default.py +++ b/app/config/local.default.py @@ -2,7 +2,7 @@ import os SQLALCHEMY_TRACK_MODIFICATIONS = False -SQLALCHEMY_DATABASE_URI = os.environ['BUILDING_SERVICE_DBURI'] +SQLALCHEMY_DATABASE_URI = os.environ['DBURI'] REDIS_URI = os.environ['REDIS_URI'] @@ -38,7 +38,7 @@ HEADER_AUTH_KEY = os.environ['HEADER_AUTH_KEY'] HEADER_AUTH_TOKEN = os.environ['HEADER_AUTH_TOKEN'] # Mechanical Turk credentials -AWS_ACCESS_KEY = os.environ['BUILDING_SERVICE_AWS_ACCESS_KEY'] -AWS_SECRET_ACCESS_KEY = os.environ['BUILDING_SERVICE_AWS_SECRET_ACCESS_KEY'] -MECH_TURK_ENDPOINT_URL = os.environ['BUILDING_SERVICE_MECH_TURK_ENDPOINT_URL'] -MECH_TURK_REGION = os.environ['BUILDING_SERVICE_MECH_TURK_REGION'] +AWS_ACCESS_KEY = os.environ['AWS_ACCESS_KEY'] +AWS_SECRET_ACCESS_KEY = os.environ['AWS_SECRET_ACCESS_KEY'] +MECH_TURK_ENDPOINT_URL = os.environ['MECH_TURK_ENDPOINT_URL'] +MECH_TURK_REGION = os.environ['MECH_TURK_REGION'] -- GitLab