Updated config to be string based not class based and removed old style live/staging files.

This commit is contained in:
Martyn Inglis
2016-07-05 14:26:02 +01:00
parent fe84674a77
commit 4222027184
4 changed files with 13 additions and 13 deletions

View File

@@ -13,8 +13,9 @@ from flask import (
current_app, current_app,
request, request,
g, g,
url_for url_for)
)
from config import configs
from flask._compat import string_types from flask._compat import string_types
from flask.globals import _lookup_req_object from flask.globals import _lookup_req_object
from flask_login import LoginManager from flask_login import LoginManager
@@ -69,7 +70,7 @@ current_service = LocalProxy(partial(_lookup_req_object, 'service'))
def create_app(): def create_app():
application = Flask(__name__) application = Flask(__name__)
application.config.from_object(os.environ['NOTIFY_ADMIN_ENVIRONMENT']) application.config.from_object(configs[os.environ['NOTIFY_ADMIN_ENVIRONMENT']])
init_app(application) init_app(application)
logging.init_app(application) logging.init_app(application)

View File

@@ -1,3 +1,3 @@
__travis_commit__ = "dev" __travis_commit__ = ""
__time__ = "dev" __time__ = "2016-07-04:17:22:35"
__travis_job_number__ = "dev" __travis_job_number__ = ""

View File

@@ -1,7 +1,7 @@
--- ---
files: files:
- -
destination: /home/ubuntu/notifications-admin destination: /home/notify-app/notifications-admin
source: / source: /
hooks: hooks:
AfterInstall: AfterInstall:

View File

@@ -3,7 +3,6 @@ from datetime import timedelta
class Config(object): class Config(object):
DEBUG = False DEBUG = False
ADMIN_CLIENT_SECRET = os.environ['ADMIN_CLIENT_SECRET'] ADMIN_CLIENT_SECRET = os.environ['ADMIN_CLIENT_SECRET']
ADMIN_CLIENT_USER_NAME = os.environ['ADMIN_CLIENT_USER_NAME'] ADMIN_CLIENT_USER_NAME = os.environ['ADMIN_CLIENT_USER_NAME']
@@ -92,9 +91,9 @@ class Live(Config):
configs = { configs = {
'development': 'config.Development', 'development': Development,
'test': 'config.Test', 'test': Test,
'preview': 'config.Preview', 'preview': Preview,
'staging': 'config.Staging', 'staging': Staging,
'live': 'config.Live' 'live': Live
} }