From b6381eb96481e574e21e27fe942d72fe00b87757 Mon Sep 17 00:00:00 2001 From: "Olivier Paroz (oparoz)" Date: Fri, 7 Oct 2016 00:30:24 +0200 Subject: [PATCH] Add Spreed.ME integration Fixes #64 Signed-off-by: Olivier Paroz (oparoz) --- snapcraft.yaml | 2 ++ src/apache/conf/httpd.conf | 2 ++ src/apache/conf/ssl.conf | 16 ++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index f240c29df..2c403f159 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -82,6 +82,8 @@ parts: - headers - proxy - proxy_fcgi + - proxy_http + - proxy_wstunnel - setenvif - env - rewrite diff --git a/src/apache/conf/httpd.conf b/src/apache/conf/httpd.conf index 742491fff..46e62e276 100644 --- a/src/apache/conf/httpd.conf +++ b/src/apache/conf/httpd.conf @@ -54,6 +54,8 @@ LoadModule headers_module modules/mod_headers.so LoadModule setenvif_module modules/mod_setenvif.so LoadModule proxy_module modules/mod_proxy.so LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +LoadModule proxy_http_module modules/mod_proxy_http.so +LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so LoadModule unixd_module modules/mod_unixd.so LoadModule dir_module modules/mod_dir.so LoadModule alias_module modules/mod_alias.so diff --git a/src/apache/conf/ssl.conf b/src/apache/conf/ssl.conf index 4e3be164a..b03b59164 100644 --- a/src/apache/conf/ssl.conf +++ b/src/apache/conf/ssl.conf @@ -145,4 +145,20 @@ SSLRandomSeed connect file:/dev/urandom 512 Header always set Strict-Transport-Security "max-age=63072000; includeSubdomains;" + + ######################### + # Spreed.ME # + ######################### + + ProxyPass http://127.0.0.1:8080/webrtc + ProxyPassReverse /webrtc + + + + ProxyPass ws://127.0.0.1:8080/webrtc/ws + + + ProxyVia On + ProxyPreserveHost On + RequestHeader set X-Forwarded-Proto 'https' env=HTTPS