ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5512 from FinnStutzenstein/update 

Fix HaProxy redirection and client
This commit is contained in:
Finn Stutzenstein 2020-08-17 13:43:02 +02:00 committed by GitHub
parent cb894c9d99 0993c25e66
commit 3fb41bf800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
haproxy/src/haproxy.cfg
View File

@ -14,29 +14,32 @@ defaults
log global
option httplog
frontend uplink
mode tcp
bind :8000
tcp-request inspect-delay 2s
tcp-request content accept if HTTP
tcp-request content accept if { req.ssl_hello_type 1 }
use_backend receive_http if HTTP
default_backend receive_https
backend receive_http
mode tcp
server loopback-for-http abns@http send-proxy-v2
backend receive_https
mode tcp
server loopback-for-https abns@https send-proxy-v2
# We have to wait for 2.3: https://github.com/haproxy/haproxy/issues/737
# WebSocket handling is broken in HaProxy 2.x, x<3
#frontend uplink
# mode tcp
# bind :8000
# tcp-request inspect-delay 2s
# tcp-request content accept if HTTP
# tcp-request content accept if { req.ssl_hello_type 1 }
# use_backend receive_http if HTTP
# default_backend receive_https
#backend receive_http
# mode tcp
# server loopback-for-http abns@http send-proxy-v2
#backend receive_https
# mode tcp
# server loopback-for-https abns@https send-proxy-v2
frontend http
mode http
bind abns@http accept-proxy
redirect scheme https code 301
#frontend http
# mode http
# bind abns@http accept-proxy
# redirect scheme https code 301
frontend https
mode http
bind abns@https accept-proxy ssl crt /usr/local/etc/haproxy/combined.pem alpn h2,http/1.1
#bind abns@https accept-proxy ssl crt /usr/local/etc/haproxy/combined.pem alpn h2,http/1.1
bind *:8000 ssl crt /usr/local/etc/haproxy/combined.pem alpn h2,http/1.1
default_backend backend_client # this is defined in the dev-*/prod-* file
acl action path_beg -i /system/action

2
openslides-client

@ -1 +1 @@
Subproject commit 0e8888fe23442bf362a77cbdefca5e406dacf020
Subproject commit 3a3c444d6495907195de1349aa475eca43ebc843