Merge pull request #1498 from wdpypere/httpd

ncm-metaconfig: httpd - add h2 options
quattor · Apr 13, 2021 · 78b9263 · 78b9263
2 parents 81ac9a0 + 21501c7
commit 78b9263
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ncm-metaconfig/src/main/metaconfig/httpd/config/vhost.tt b/ncm-metaconfig/src/main/metaconfig/httpd/config/vhost.tt
@@ -11,7 +11,9 @@ hostnamelookups [% vhost.hostnamelookups ? "on" : "off" %]
 [% IF vhost.exists('limitrequestbody') %]
 limitrequestbody [% vhost.limitrequestbody %]
 [% END -%]
-
+[% IF vhost.exists('protocols') -%]
+protocols [% vhost.protocols.join(' ') %]
+[% END -%]
 [%- to_process = ['ssl', 'nss', 'env', 'aliases', 'rewrite', 'redirect',
                   'perl', 'wsgi', 'log', 'rails', 'browsermatch', 'passenger', 'oidc', 'header'] -%]
 [%- FOREACH p IN  to_process -%]

diff --git a/ncm-metaconfig/src/main/metaconfig/httpd/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/httpd/pan/schema.pan
@@ -31,6 +31,8 @@ type httpd_nss_cipherstring = string with match(SELF, '^(-(rsa_3des_sha|rsa_des_
     'ecdhe_rsa_aes_256_sha|ecdhe_rsa_aes_256_sha_384|ecdh_rsa_aes_128_sha|ecdh_rsa_aes_256_sha|' +
     'rsa_aes_128_gcm_sha_256|rsa_aes_128_sha|rsa_aes_256_gcm_sha_384|rsa_aes_256_sha))$');
 
+type httpd_protocols = choice("h2", "h2c", "http/1.1");
+
 @documentation{
     Either all Options must start with + or -, or no Option may.
 }
@@ -620,6 +622,7 @@ type httpd_vhost = {
     "browsermatch" ? httpd_browsermatch[]
     "passenger" ? httpd_passenger_vhost
     "header" ? httpd_header[]
+    "protocols" ? httpd_protocols[]
 };
 
 # system wide settings