rapid-cdn: c->h: Implement disable-no-cache-request

software/rapid-cdn/buildout.hash.cfg

@@ -38,11 +38,11 @@ md5sum = cba4d995962f7fbeae3f61c9372c4181
 
 [template-frontend-haproxy-configuration]
 _update_hash_filename_ = templates/frontend-haproxy.cfg.in
-md5sum = cab77efb4f7a3bd0a932055d33583640
+md5sum = 59d9ad255c00c67c6181f1929bf333c6
 
 [template-frontend-haproxy-crt-list]
 _update_hash_filename_ = templates/frontend-haproxy-crt-list.in
-md5sum = f444c9735e5247faba26831fda6f27f9
+md5sum = 13c294af9950939c76021eb19305f3ab
 
 [template-not-found-html]
 _update_hash_filename_ = templates/notfound.html

software/rapid-cdn/templates/default-virtualhost.conf.in

@@ -34,13 +34,6 @@
   bind {{ slave_parameter['local_ipv4'] }}
 {%- if tls %}
   tls {{ slave_parameter['certificate'] }} {{ slave_parameter['certificate'] }} {
-{%- if slave_parameter['enable_h2'] %}
-    # Allow http2
-    alpn h2 http/1.1
-{%- else %} {#- if slave_parameter['enable_h2'] #}
-    # Disallow HTTP2
-    alpn http/1.1
-{%- endif %} {#- if slave_parameter['enable_h2'] #}
   } {# tls #}
 {%- endif %} {#- if tls #}
   log / {{ slave_parameter['access_log'] }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {

software/rapid-cdn/templates/frontend-haproxy-crt-list.in

@@ -6,6 +6,11 @@
 {%-   if slave['ciphers'] %}
 {%-     do sslbindconf.append('ciphers %s' % (slave['ciphers']),) %}
 {%-   endif %}
+{%-   if slave['enable_h2'] %}
+{%-     do sslbindconf.append('alpn h2,http/1.1,http/1.0') %}
+{%-   else %}
+{%-     do sslbindconf.append('alpn http/1.1,http/1.0') %}
+{%-   endif %}
 {%-   do entry_list.append('[' + ' '.join(sslbindconf) + ']') %}
 {#-   <snifilter> #}
 {%-   do entry_list.extend(slave['host_list']) %}

software/rapid-cdn/templates/frontend-haproxy.cfg.in

@@ -114,6 +114,10 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }}
 {%-         for disabled_cookie in slave_instance['disabled-cookie-list'] %}
   http-request replace-header Cookie (.*)(^{{ disabled_cookie | replace('%', '%%') }}=[^;]*;\ |;\ {{ disabled_cookie }}=[^;]*|^{{ disabled_cookie }}=[^;]*$)(.*) \1\3
 {%-         endfor %}
+{%-         if slave_instance['disable-no-cache-request'] %}
+  http-request del-header Cache-Control
+  http-request del-header Pragma
+{%-         endif %}
 {%-         if info_dict['path'] %}
   http-request set-path {{ info_dict['path'] }}%[path]
 {%-         endif %} {# if info_dict['path'] #}