From 2cb64c034d1cf5a6f0ac521b61ecc9dbe48a3fb4 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Wed, 15 Jan 2020 22:28:41 -0500 Subject: [PATCH] set ssl_port in ansible config properly based on installType --- automation/roles/bubble/files/bubble_role.json | 2 +- automation/roles/bubble/templates/bubble.env.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/roles/bubble/files/bubble_role.json b/automation/roles/bubble/files/bubble_role.json index 436ee025..cf095275 100644 --- a/automation/roles/bubble/files/bubble_role.json +++ b/automation/roles/bubble/files/bubble_role.json @@ -6,7 +6,7 @@ {"name": "node_uuid", "value": "[[node.uuid]]"}, {"name": "network_uuid", "value": "[[node.network]]"}, {"name": "admin_port", "value": "[[node.adminPort]]"}, - {"name": "ssl_port", "value": "[[configuration.nginxPort]]"}, + {"name": "ssl_port", "value": "[[#compare installType '==' 'sage']]443[[else]][[configuration.nginxPort]][[/compare]]"}, {"name": "sage_node", "value": "[[sageNode]]"}, {"name": "install_type", "value": "[[installType]]"}, {"name": "default_locale", "value": "[[network.locale]]"}, diff --git a/automation/roles/bubble/templates/bubble.env.j2 b/automation/roles/bubble/templates/bubble.env.j2 index 73837c18..743efabc 100644 --- a/automation/roles/bubble/templates/bubble.env.j2 +++ b/automation/roles/bubble/templates/bubble.env.j2 @@ -1,4 +1,4 @@ -export PUBLIC_BASE_URI=https://{{ bubble_cname }}:{{ ssl_port }} +export PUBLIC_BASE_URI=https://{{ bubble_cname }}{{#compare ssl_port '!=' 443}}:{{ ssl_port }}{{/compare}} export SELF_NODE={{ node_uuid }} export SAGE_NODE={{ sage_node }} export LETSENCRYPT_EMAIL={{ letsencrypt_email }}