From 12186da25fab239b74f3c2e29f8e1a0cce5fceab Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Wed, 12 Sep 2018 01:55:40 +0200
Subject: [PATCH] Fix websockets for prod openshift

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
---
 playbooks/include/proxies-websites.yml                   | 6 ++++++
 roles/httpd/reverseproxy/templates/reversepassproxy.conf | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 403e1e6f1a..5e9bf89ae2 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -576,6 +576,9 @@
     site_name: os.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
+    # The Connection and Upgrade headers don't work for h2
+    # So non-h2 is needed to fix websockets.
+    use_h2: false
     tags:
     - os.fedoraproject.org
 
@@ -585,6 +588,9 @@
     sslonly: true
     cert_name: "{{os_wildcard_cert_name}}"
     SSLCertificateChainFile: "{{os_wildcard_int_file}}"
+    # The Connection and Upgrade headers don't work for h2
+    # So non-h2 is needed to fix websockets.
+    use_h2: false
     tags:
     - app.os.fedoraproject.org
 
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.conf
index 77a8dd35b2..06f913720f 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.conf
@@ -19,7 +19,6 @@ ProxyPreserveHost On
 
 {% if balancer_name is defined %}
 SSLProxyEngine On
-{% if env == "staging" %}
 
 <Proxy "balancer://{{balancer_name}}-websocket">
   {% for member in balancer_members %}
@@ -32,7 +31,6 @@ RewriteCond %{HTTP:Upgrade} ^WebSocket$ [NC]
 RewriteCond %{HTTP:Connection} ^Upgrade$ [NC]
 RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P]
 
-{% endif %}
 <Proxy "balancer://{{balancer_name}}">
   {% for member in balancer_members %}
     BalancerMember "https://{{ member }}"