From 77fba2c6ed003a28b82aa886602360ad69b451f1 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 14 Jun 2018 00:12:50 +0000
Subject: [PATCH] Revert "disable h2 again for now until we can get curl fixed
 in f28 and f27 to handle correctly h2 goaway responses. See
 https://github.com/curl/curl/commit/d122df5972fc01e39ae28e6bca705237d7e3318a
 and https://bugzilla.redhat.com/show_bug.cgi?id=1585797 and
 https://pagure.io/releng/issue/7550"

This reverts commit 1bb844c9f02ab3774fb38da84b7c41c39e80edd3.
---
 files/httpd/h2.conf.j2                     | 3 +--
 roles/httpd/website/templates/website.conf | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/files/httpd/h2.conf.j2 b/files/httpd/h2.conf.j2
index 8c8015cf28..2627ea8a32 100644
--- a/files/httpd/h2.conf.j2
+++ b/files/httpd/h2.conf.j2
@@ -1,2 +1 @@
-Protocols http/1.1
-#Protocols h2 {% if not inventory_hostname.startswith('proxy') %} h2c {% endif %} http/1.1
+Protocols h2 {% if not inventory_hostname.startswith('proxy') %} h2c {% endif %} http/1.1
diff --git a/roles/httpd/website/templates/website.conf b/roles/httpd/website/templates/website.conf
index a0bdeb44e7..061c6291b3 100644
--- a/roles/httpd/website/templates/website.conf
+++ b/roles/httpd/website/templates/website.conf
@@ -33,8 +33,7 @@
   ServerAdmin {{ server_admin }}
 
 {% if ansible_distribution == 'Fedora' %}
-  Protocols http/1.1
-#  Protocols h2 http/1.1
+  Protocols h2 http/1.1
 {% endif %}
 
 {% if gzip %}