Commit 42675e43 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: jinja part for frontend is now correct

parent dc94ac1d
...@@ -46,35 +46,33 @@ software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'Root ...@@ -46,35 +46,33 @@ software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'Root
slave = true slave = true
name = Custom Web Frontend name = Custom Web Frontend
server-url = ${slap-connection:server-url} server-url = $${slap-connection:server-url}
key-file = ${slap-connection:key-file} key-file = $${slap-connection:key-file}
cert-file = ${slap-connection:cert-file} cert-file = $${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id} computer-id = $${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id} partition-id = $${slap-connection:partition-id}
{% if slapparameter_dict.get('custom-frontend-instance-guid') -%} {% if slapparameter_dict.get('custom-frontend-instance-guid') -%}
sla = instance_guid sla = instance_guid
sla-instance_guid = ${slap-parameter:frontend-instance-guid} sla-instance_guid = $${slap-parameter:frontend-instance-guid}
{% endif -%} {% endif -%}
config = url type custom-domain config = url
# XXX: allow http/https configuration
config-url = {{ slapparameter_dict.get('custom-frontend-backend-url') }} config-url = {{ slapparameter_dict.get('custom-frontend-backend-url') }}
config-custom-domain = {% if slapparameter_dict.get('custom-frontend-domain') -%} {{ slapparameter_dict.get('custom-frontend-domain') }} {% endif %} return = site_url domain
config-type = {% if slapparameter_dict.get('custom-frontend-type') -%} {{ slapparameter_dict.get('custom-frontend-type') }} {% endif %}
config-path = {% if slapparameter_dict.get('custom-frontend-path') -%} {{ slapparameter_dict.get('custom-frontend-path') }} {% endif %}
return = frontend_ipv4_address site_url
[custom-frontend-promise] [custom-frontend-promise]
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
path = ${directory:promises}/custom_frontend_promise path = $${directory:promises}/custom_frontend_promise
url = ${request-custom-frontend:connection-site_url} url = https://$${request-custom-frontend:connection-domain}
{% if slapparameter_dict.get('custom-frontend-basic-auth') -%}
check-secure = 1
{% endif -%}
dash_path = {{ dash_executable_location }} dash_path = {{ dash_executable_location }}
curl_path = {{ curl_executable_location }} curl_path = {{ curl_executable_location }}
[publish-connection-informations] [publish-connection-informations]
custom-frontend-url = ${request-custom-frontend:connection-site_url} custom-frontend-url = https://$${request-custom-frontend:connection-domain}
custom-frontend-ipv4 = ${request-custom-frontend:connection-frontend_ipv4_address}
[buildout] [buildout]
# XXX: hardcoded and duplicated list of parts. # XXX: hardcoded and duplicated list of parts.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment