Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix websockets for prod openshift

Browse source 
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
Patrick Uiterwijk 2018-09-12 01:55:40 +02:00
parent 44f6ac6277
commit 12186da25f
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
playbooks/include/proxies-websites.yml
View file

@ -576,6 +576,9 @@
site_name: os.fedoraproject.org site_name: os.fedoraproject.org
sslonly: true sslonly: true
cert_name: "{{wildcard_cert_name}}" 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: tags:
- os.fedoraproject.org - os.fedoraproject.org
@ -585,6 +588,9 @@
sslonly: true sslonly: true
cert_name: "{{os_wildcard_cert_name}}" cert_name: "{{os_wildcard_cert_name}}"
SSLCertificateChainFile: "{{os_wildcard_int_file}}" 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: tags:
- app.os.fedoraproject.org - app.os.fedoraproject.org

2
roles/httpd/reverseproxy/templates/reversepassproxy.conf
View file

@ -19,7 +19,6 @@ ProxyPreserveHost On
{% if balancer_name is defined %} {% if balancer_name is defined %}
SSLProxyEngine On SSLProxyEngine On
{% if env == "staging" %}
<Proxy "balancer://{{balancer_name}}-websocket"> <Proxy "balancer://{{balancer_name}}-websocket">
{% for member in balancer_members %} {% for member in balancer_members %}
@ -32,7 +31,6 @@ RewriteCond %{HTTP:Upgrade} ^WebSocket$ [NC]
RewriteCond %{HTTP:Connection} ^Upgrade$ [NC] RewriteCond %{HTTP:Connection} ^Upgrade$ [NC]
RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P] RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P]
{% endif %}
<Proxy "balancer://{{balancer_name}}"> <Proxy "balancer://{{balancer_name}}">
{% for member in balancer_members %} {% for member in balancer_members %}
BalancerMember "https://{{ member }}" BalancerMember "https://{{ member }}"