Explorar el Código

set ssl_port in ansible config properly based on installType

tags/v0.1.8
Jonathan Cobb hace 5 años
padre
commit
2cb64c034d
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. +1
    -1
      automation/roles/bubble/files/bubble_role.json
  2. +1
    -1
      automation/roles/bubble/templates/bubble.env.j2

+ 1
- 1
automation/roles/bubble/files/bubble_role.json Ver fichero

@@ -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]]"},


+ 1
- 1
automation/roles/bubble/templates/bubble.env.j2 Ver fichero

@@ -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 }}


Cargando…
Cancelar
Guardar