From: Julien Cristau <jcristau@debian.org>
Date: Fri, 1 Jun 2018 19:13:26 +0000 (+0200)
Subject: Enable HTTP/2 on sources.d.o
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=8f3647ed42d4f68cf4b6808c18872a441743d087

Enable HTTP/2 on sources.d.o
---

diff --git a/modules/roles/files/debsources/sources.debian.org.conf b/modules/roles/files/debsources/sources.debian.org.conf
index d155ef6bf..4d211a23b 100644
--- a/modules/roles/files/debsources/sources.debian.org.conf
+++ b/modules/roles/files/debsources/sources.debian.org.conf
@@ -10,6 +10,8 @@ WSGIDaemonProcess sources.debian.org user=nobody group=debsources home=/ process
     Use common-ssl-HSTS
     Use http-pkp-sources.debian.org
 
+    Protocols h2 http/1.1
+
     <IfModule mod_userdir.c>
         UserDir disabled
     </IfModule>
diff --git a/modules/roles/manifests/debsources.pp b/modules/roles/manifests/debsources.pp
index dd5237e5a..6633b5186 100644
--- a/modules/roles/manifests/debsources.pp
+++ b/modules/roles/manifests/debsources.pp
@@ -5,6 +5,7 @@ class roles::debsources {
 	}
 
 	include apache2::ssl
+	apache2::module { 'http2': }
 	package { 'libapache2-mod-wsgi': ensure => installed, }
 	apache2::site { 'sources.debian.org':
 		site => 'sources.debian.org',