From 364cd59a668d909ebb0d231ba145bf93aa48bbc6 Mon Sep 17 00:00:00 2001 From: akkking Date: Wed, 6 Feb 2019 12:41:35 -0500 Subject: [PATCH 1/2] Update config --- app/config/local.default.py | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/config/local.default.py b/app/config/local.default.py index 9cddc38..c052c15 100644 --- a/app/config/local.default.py +++ b/app/config/local.default.py @@ -1,22 +1,22 @@ SQLALCHEMY_TRACK_MODIFICATIONS = False -SQLALCHEMY_DATABASE_URI = 'sqlite://' -REDSHIFT_DATABASE_URI = 'redshift://' +SQLALCHEMY_DATABASE_URI = os.environ['IOT_SERVICE_DBURI'] +REDSHIFT_DATABASE_URI = os.environ['IOT_SERVICE_REDSHIFT_DATABASE_URI'] -REDIS_URI = 'redis://127.0.0.1:6379/' +REDIS_URI = os.environ['REDIS_URI'] DEBUG = True SERVICE_CONFIG = { - 'app_key': '$APP_KEY', - 'app_secret': '$APP_SECRET', + 'app_key': os.environ['IOT_SERVICE_APP_KEY'], + 'app_secret': os.environ['IOT_SERVICE_APP_SECRET'], 'headers': { 'app_key': 'x-blocpower-app-key', 'app_token': 'x-blocpower-app-token', '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'], } } @@ -24,19 +24,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'] # AWS credentials -AWS_ACCESS_KEY = '$AWS_ACCESS_KEY' -AWS_SECRET_ACCESS_KEY = '$AWS_SECRET_ACCESS_KEY' -AWS_REGION = '$AWS_REGION' -AWS_ACCOUNT_ID = '$AWS_ACCOUNT_ID' +AWS_ACCESS_KEY = os.environ['IOT_SERVICE_AWS_ACCESS_KEY'] +AWS_SECRET_ACCESS_KEY = os.environ['IOT_SERVICE_AWS_SECRET_ACCESS_KEY'] +AWS_REGION = os.environ['IOT_SERVICE_AWS_REGION'] +AWS_ACCOUNT_ID = os.environ['IOT_SERVICE_AWS_ACCOUNT_ID'] -- GitLab From 4c3778e76ff5e54364f10cb7ee1fa311e3886498 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Thu, 7 Feb 2019 15:14:04 -0500 Subject: [PATCH 2/2] Remove prefixes from environment variables. --- app/config/local.default.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/config/local.default.py b/app/config/local.default.py index c052c15..71e2d4b 100644 --- a/app/config/local.default.py +++ b/app/config/local.default.py @@ -1,14 +1,14 @@ SQLALCHEMY_TRACK_MODIFICATIONS = False -SQLALCHEMY_DATABASE_URI = os.environ['IOT_SERVICE_DBURI'] -REDSHIFT_DATABASE_URI = os.environ['IOT_SERVICE_REDSHIFT_DATABASE_URI'] +SQLALCHEMY_DATABASE_URI = os.environ['DBURI'] +REDSHIFT_DATABASE_URI = os.environ['REDSHIFT_DATABASE_URI'] REDIS_URI = os.environ['REDIS_URI'] DEBUG = True SERVICE_CONFIG = { - 'app_key': os.environ['IOT_SERVICE_APP_KEY'], - 'app_secret': os.environ['IOT_SERVICE_APP_SECRET'], + 'app_key': os.environ['APP_KEY'], + 'app_secret': os.environ['APP_SECRET'], 'headers': { 'app_key': 'x-blocpower-app-key', 'app_token': 'x-blocpower-app-token', @@ -36,7 +36,7 @@ HEADER_AUTH_KEY = os.environ['HEADER_AUTH_KEY'] HEADER_AUTH_TOKEN = os.environ['HEADER_AUTH_TOKEN'] # AWS credentials -AWS_ACCESS_KEY = os.environ['IOT_SERVICE_AWS_ACCESS_KEY'] -AWS_SECRET_ACCESS_KEY = os.environ['IOT_SERVICE_AWS_SECRET_ACCESS_KEY'] -AWS_REGION = os.environ['IOT_SERVICE_AWS_REGION'] -AWS_ACCOUNT_ID = os.environ['IOT_SERVICE_AWS_ACCOUNT_ID'] +AWS_ACCESS_KEY = os.environ['AWS_ACCESS_KEY'] +AWS_SECRET_ACCESS_KEY = os.environ['AWS_SECRET_ACCESS_KEY'] +AWS_REGION = os.environ['AWS_REGION'] +AWS_ACCOUNT_ID = os.environ['AWS_ACCOUNT_ID'] -- GitLab