XXX: Move out logic higher

software/caddy-frontend/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = b29a4764dd489030030a72770162c157
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = 4c0cf528c52fc4d463653a1cb08a3d81
+md5sum = 0381ba58321bad8b049dcf8f4bfcf753
 
 [profile-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -46,7 +46,7 @@ md5sum = 88af61e7abbf30dc99a1a2526161128d
 
 [template-default-slave-virtualhost]
 _update_hash_filename_ = templates/default-virtualhost.conf.in
-md5sum = 266f175dbdfc588af7a86b0b1884fe73
+md5sum = 2af3567049a2478e6e9f0731cdeefe4f
 
 [template-backend-haproxy-configuration]
 _update_hash_filename_ = templates/backend-haproxy.cfg.in

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -315,6 +315,40 @@ recipe = slapos.cookbook:publish
 {%-   else %}
 {%-     do slave_instance_information_list.append(slave_publish_dict) %}
 {%-   endif %}
+{#- BEGIN: Extracted logic from templates/default-virtualhost.conf.in #}
+{%-  set host_list = slave_instance.get('server-alias', '').split() %}
+{%-  if slave_instance.get('custom_domain') not in host_list %}
+{%-    do host_list.append(slave_instance.get('custom_domain')) %}
+{%-  endif %}
+{%-  do slave_instance.__setitem__('host_list', host_list) %}
+{%-  do slave_instance.__setitem__('cipher_list', slave_instance.get('cipher_list', '').strip()) %}
+{%-  do slave_instance.__setitem__('type', slave_instance.get('type', '')) %}
+{%-  for key in ['https-only', 'websocket-transparent'] %}
+{%-    do slave_instance.__setitem__(key, slave_instance.get(key, 'true').lower() in TRUE_VALUES) %}
+{%-  endfor %}
+{%-  for key in ['enable_cache', 'disable-no-cache-request', 'disable-via-header', 'prefer-gzip-encoding-to-backend'] %}
+{%-    do slave_instance.__setitem__(key, slave_instance.get(key, 'false').lower() in TRUE_VALUES) %}
+{%-  endfor %}
+{%-  for key in ['disabled-cookie-list'] %}
+{%-    do slave_instance.__setitem__(key, slave_instance.get(key, '').split()) %}
+{%-  endfor %}
+{%-  do slave_instance.__setitem__('default-path', slave_instance.get('default-path', '').strip('/') | urlencode) %}
+{%-  set websocket_path_list = [] %}
+{%-  for websocket_path in slave_instance.get('websocket-path-list', '').split() %}
+{%-    set websocket_path = websocket_path.strip('/') %}
+{#- Unquote the path, so %20 and similar can be represented correctly #}
+{%-    set websocket_path = urllib_module.unquote(websocket_path.strip()) %}
+{%-    if websocket_path %}
+{%-      do websocket_path_list.append(websocket_path) %}
+{%-    endif %}
+{%-  endfor %}
+{%-  do slave_instance.__setitem__('websocket-path-list', websocket_path_list) %}
+{%-  do slave_instance.__setitem__('enable_h2', slave_instance['global_disable_http2'].lower() not in TRUE_VALUES and slave_instance.get('enable-http2', slave_instance['enable_http2_by_default']).lower() in TRUE_VALUES) %}
+{%-  if slave_instance['type'] in ['notebook', 'websocket'] %}
+{# websocket style needs http 1.1 max #}
+{%-    do slave_instance.__setitem__('enable_h2', False) %}
+{%-  endif %}
+{#- END: Extracted logic from templates/default-virtualhost.conf.in #}
 {%-  do frontend_slave_list.append(slave_instance) %}
 {%-  if slave_type != 'redirect' %}
 {%-    do backend_slave_list.append(slave_instance) %}

software/caddy-frontend/templates/default-virtualhost.conf.in

-{%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] %}
-{%- set enable_cache = slave_parameter.get('enable_cache', '').lower() in TRUE_VALUES %}
-{%- set disable_no_cache_header = slave_parameter.get('disable-no-cache-request', '').lower() in TRUE_VALUES %}
-{%- set disable_via_header = slave_parameter.get('disable-via-header', '').lower() in TRUE_VALUES %}
-{%- set prefer_gzip = slave_parameter.get('prefer-gzip-encoding-to-backend', '').lower() in TRUE_VALUES %}
 {%- set proxy_append_list = [('', 'Default proxy configuration')] %}
 {%- if prefer_gzip %}
 {%- do proxy_append_list.append(('prefer-gzip', 'Proxy which always overrides Accept-Encoding to gzip if such is found')) %}
 {%- endif %} {#- if prefer_gzip #}
-{%- set server_alias_list =  slave_parameter.get('server-alias', '').split() %}
-{%- set enable_h2 = slave_parameter['global_disable_http2'].lower() not in TRUE_VALUES and slave_parameter.get('enable-http2', slave_parameter['enable_http2_by_default']).lower() in TRUE_VALUES %}
-{%- set disabled_cookie_list =  slave_parameter.get('disabled-cookie-list', '').split() %}
-{%- set https_only = slave_parameter.get('https-only', 'true').lower() in TRUE_VALUES %}
-{%- set slave_type = slave_parameter.get('type', '') %}
-{%- set host_list = server_alias_list %}
-{%- set cipher_list = slave_parameter.get('cipher_list', '').strip() %}
-{%- if slave_parameter.get('custom_domain') not in host_list %}
-{%-   do host_list.append(slave_parameter.get('custom_domain')) %}
-{%- endif %}
 {%- set http_host_list = [] %}
 {%- set https_host_list = [] %}
 {%- for host in host_list %}
 {%-   do http_host_list.append('http://%s:%s' % (host, slave_parameter['http_port'] )) %}
 {%-   do https_host_list.append('https://%s:%s' % (host, slave_parameter['https_port'] )) %}
 {%- endfor %} {#- for host in host_list #}
-{%- set default_path = slave_parameter.get('default-path', '').strip('/') | urlencode %}
-{%- set websocket_path_list = [] %}
-{%- for websocket_path in slave_parameter.get('websocket-path-list', '').split() %}
-{%-   set websocket_path = websocket_path.strip('/') %}
-{#- Unquote the path, so %20 and similar can be represented correctly #}
-{%-   set websocket_path = urllib_module.unquote(websocket_path.strip()) %}
-{%-   if websocket_path %}
-{%-     do websocket_path_list.append(websocket_path) %}
-{%-   endif %}
-{%- endfor %}
-{%- set websocket_transparent = slave_parameter.get('websocket-transparent', 'true').lower() in TRUE_VALUES %}
-{%- if slave_type in ['notebook', 'websocket'] %}
-{# websocket style needs http 1.1 max #}
-{%-   set enable_h2 = False %}
-{%- endif %}
 
 {%- macro proxy_header() %}
     timeout {{ slave_parameter['request-timeout'] }}s