From 4a1cf5aae64bf5cbe498b783f1724c86dc0b228c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 19 Jun 2020 21:45:18 +0200 Subject: server port stuff --- cli/app/server/web.py | 1 + cli/app/settings/app_cfg.py | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'cli') diff --git a/cli/app/server/web.py b/cli/app/server/web.py index 83dbc24..0436cd4 100644 --- a/cli/app/server/web.py +++ b/cli/app/server/web.py @@ -30,6 +30,7 @@ def create_app(script_info=None): app = Flask(__name__, static_folder=app_cfg.DIR_STATIC, static_url_path='/static') app.config['SQLALCHEMY_DATABASE_URI'] = connection_url app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SERVER_NAME'] = app_cfg.SERVER_NAME app.url_map.strict_slashes = False db.init_app(app) diff --git a/cli/app/settings/app_cfg.py b/cli/app/settings/app_cfg.py index 758056e..14f2efc 100644 --- a/cli/app/settings/app_cfg.py +++ b/cli/app/settings/app_cfg.py @@ -72,19 +72,15 @@ HASH_BRANCH_SIZE = 3 # for sha256 subdirs try: S3_HTTP_BASE_URL = os.getenv("S3_HTTP_BASE_URL") - DIR_S3_VER = 'v2' - DIR_S3_MODELS = join(DIR_S3_VER, 'models') - S3_HTTP_MODELS_URL = join(S3_HTTP_BASE_URL, DIR_S3_MODELS) except Exception as e: - # LOG.error(f'S3 .env variables not set. Can not access models.') pass # ----------------------------------------------------------------------------- # Exports # ----------------------------------------------------------------------------- -HTTP_EXTERNAL_HOST = os.getenv('HTTP_EXTERNAL_HOST') or "http://0.0.0.0:5000" - +SERVER_NAME = os.getenv('SERVER_NAME') or '0.0.0.0:5000' +HTTP_EXTERNAL_HOST = os.getenv('HTTP_EXTERNAL_HOST') or f"http://{SERVER_NAME}" # ----------------------------------------------------------------------------- # Unicode symbols for logger -- cgit v1.2.3-70-g09d2