caddy-frontend: Support enable-http2

software/caddy-frontend/buildout.hash.cfg

@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
-md5sum = 838652253957f1d9b89beeecacded7f9
+md5sum = 953444cb8b324bcd3cb3fecc14bee0ac
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in

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

@@ -25,6 +25,11 @@
   tls {{ slave_parameter.get('path_to_ssl_crt', slave_parameter.get('login_certificate')) }} {{ slave_parameter.get('path_to_ssl_key', slave_parameter.get('login_key')) }} {
 {%- if slave_parameter.get('path_to_ssl_ca_crt') %}
     clients {{ slave_parameter.get('path_to_ssl_ca_crt') }}
+{%- endif %}
+{%- if enable_h2 %}
+    alpn h2 http/1.1
+{%- else %}
+    alpn http/1.1
 {%- endif %}
   }
 # TODO-Caddy   # One Slave two logs
@@ -37,10 +42,6 @@
 # TODO-Caddy   SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
 # TODO-Caddy   SSLHonorCipherOrder on
 
-{% if enable_h2 %}
-# TODO-Caddy   Protocols h2 http/1.1
-{% endif -%}
-
 {% if disable_via_header %}
 # TODO-Caddy   Header unset Via
 {% endif -%}
@@ -130,10 +131,6 @@
 # TODO-Caddy   # Remove "Secure" from cookies, as backend may be https
 # TODO-Caddy   Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
 
-{% if enable_h2 %}
-# TODO-Caddy   Protocols h2 http/1.1
-{% endif -%}
-
 {% if disable_no_cache_header %}
 # TODO-Caddy   RequestHeader unset Cache-Control
 # TODO-Caddy   RequestHeader unset Pragma