From 4e5bba1fd5259c7f8aca17c634ea5ee46e0db509 Mon Sep 17 00:00:00 2001 From: Alex Hunt Date: Tue, 27 Nov 2018 19:12:00 -0800 Subject: [PATCH] Enabling deploy to ElasticBeanstalk --- .gitignore | 1 + application.py | 3 ++- blueprints/api.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1eb47c9..f008706 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.aws/ config.py /static !/static/style.css diff --git a/application.py b/application.py index 8b31276..8c8f7a0 100644 --- a/application.py +++ b/application.py @@ -1,5 +1,6 @@ from flask import Flask import json +import config from blueprints.joyce import joyce from blueprints.api import api @@ -8,7 +9,7 @@ from blueprints.api import api application = Flask(__name__) params = { - 'ENV': 'staging', + 'ENV': config.ENVIRONMENT, 'DEBUG': True, } application.config.update(params) diff --git a/blueprints/api.py b/blueprints/api.py index 9ef48fd..08a4abb 100644 --- a/blueprints/api.py +++ b/blueprints/api.py @@ -12,10 +12,10 @@ sys.path.insert(0,'..') reload(sys) sys.setdefaultencoding("utf-8") -if config.ENV_VARIABLE == 'local': +if config.ENVIRONMENT == 'local': es = Elasticsearch(config.ELASTICSEARCH_LOCAL_HOST) -if config.ENV_VARIABLE == 'staging': +if config.ENVIRONMENT == 'staging': es = Elasticsearch( hosts = config.ELASTICSEARCH_STAGING_HOST, http_auth = config.AWS_AUTH,