From 557a9e3480fb81df54eb3900ef8edd3f8b9ded9f Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 1 Apr 2018 22:06:30 -0400 Subject: [PATCH] implement bind configuration --- pygeoapi-config.yml | 7 ++++--- pygeoapi/flask_app.py | 8 +++----- pygeoapi/openapi.py | 5 +---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pygeoapi-config.yml b/pygeoapi-config.yml index 83b1fb2..ce1e72c 100644 --- a/pygeoapi-config.yml +++ b/pygeoapi-config.yml @@ -1,7 +1,8 @@ server: - host: localhost - port: 5000 - basepath: / + bind: + host: localhost + port: 5000 + url: http://geo.kralidis.ca/pygeoapi mimetype: application/json; charset=UTF-8 encoding: utf-8 language: en-US diff --git a/pygeoapi/flask_app.py b/pygeoapi/flask_app.py index 1afad16..78ba85e 100644 --- a/pygeoapi/flask_app.py +++ b/pygeoapi/flask_app.py @@ -39,7 +39,6 @@ from flask_cors import CORS from pygeoapi import views from pygeoapi.config import settings from pygeoapi.log import setup_logger -from pygeoapi.util import get_url APP = Flask(__name__) APP.url_map.strict_slashes = False @@ -129,8 +128,7 @@ def serve(ctx, debug=False): setup_logger() # TODO: get scheme - BASEURL = get_url('http', settings['server']['host'], - settings['server']['port'], - settings['server']['basepath']) + BASEURL = settings['server']['url'] APP.config['PYGEOAPI_BASEURL'] = BASEURL - APP.run(debug=True, host='0.0.0.0', port=settings['server']['port']) + APP.run(debug=True, host='0.0.0.0', + port=settings['server']['bind']['port']) diff --git a/pygeoapi/openapi.py b/pygeoapi/openapi.py index 739ae09..f4dda61 100644 --- a/pygeoapi/openapi.py +++ b/pygeoapi/openapi.py @@ -69,11 +69,8 @@ def get_oas_30(cfg): } oas['info'] = info - url = 'http://{}'.format(cfg['server']['host']) - if cfg['server']['port'] not in [80, 443]: - url = '{}:{}'.format(url, cfg['server']['port']) oas['servers'] = [{ - 'url': url, + 'url': cfg['server']['url'], 'description': cfg['metadata']['identification']['description'] }]