From 439b44c61fa39e6e0c7bff6fc826c6da86dcb829 Mon Sep 17 00:00:00 2001 From: Qian Deng Date: Fri, 10 May 2019 16:53:25 +0800 Subject: [PATCH] Fix public url shoud not display port is it's default value (#7760) if https port is 443 or http port is 80, then only showing url Signed-off-by: Qian Deng --- make/photon/prepare/utils/configs.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/make/photon/prepare/utils/configs.py b/make/photon/prepare/utils/configs.py index 4790c0030..c0b849300 100644 --- a/make/photon/prepare/utils/configs.py +++ b/make/photon/prepare/utils/configs.py @@ -83,9 +83,15 @@ def parse_yaml_config(config_file_path): config_dict['public_url'] = configs.get('external_url') else: if config_dict['protocol'] == 'https': - config_dict['public_url'] = '{protocol}://{hostname}:{https_port}'.format(**config_dict) + if config_dict['https_port'] == 443: + config_dict['public_url'] = '{protocol}://{hostname}'.format(**config_dict) + else: + config_dict['public_url'] = '{protocol}://{hostname}:{https_port}'.format(**config_dict) else: - config_dict['public_url'] = '{protocol}://{hostname}:{http_port}'.format(**config_dict) + if config_dict['http_port'] == 80: + config_dict['public_url'] = '{protocol}://{hostname}'.format(**config_dict) + else: + config_dict['public_url'] = '{protocol}://{hostname}:{http_port}'.format(**config_dict) # DB configs db_configs = configs.get('database')