caddy-frontend: Support enable-http2

software/caddy-frontend/buildout.hash.cfg

@@ -55,7 +55,7 @@ md5sum = 4dbb8560e4de1af2a0706b020e713fe7
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
-md5sum = 11f1784afb63a1b79221677148bc8db6
+md5sum = 8a0b6c937384c299dd36274c9fa8d104
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in

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

@@ -21,6 +21,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
@@ -33,10 +38,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 -%}
@@ -120,10 +121,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