Merge pull request #17732 from kepstin/etherpad-scheme

nginx config: Allow overriding the $scheme variable
This commit is contained in:
Anton Georgiev 2023-05-03 13:13:49 -04:00 committed by GitHub
commit 84374a761f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions

View File

@ -15,7 +15,7 @@ location /pad/p/ {
proxy_set_header X-Real-IP $remote_addr; # http://wiki.nginx.org/HttpProxyModule
proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP
proxy_set_header X-Forwarded-Proto $scheme; # for EP to set secure cookie flag when https is used
proxy_set_header X-Forwarded-Proto $real_scheme; # for EP to set secure cookie flag when https is used
proxy_http_version 1.1;
auth_request /bigbluebutton/connection/checkAuthorization;
@ -57,7 +57,7 @@ location /pad/socket.io {
proxy_buffering off;
proxy_set_header X-Real-IP $remote_addr; # http://wiki.nginx.org/HttpProxyModule
proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP
proxy_set_header X-Forwarded-Proto $scheme; # for EP to set secure cookie flag when https is used
proxy_set_header X-Forwarded-Proto $real_scheme; # for EP to set secure cookie flag when https is used
proxy_set_header Host $host; # pass the host header
proxy_http_version 1.1; # recommended with keepalive connections
# WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html

View File

@ -1,17 +1,21 @@
server {
listen 80;
listen [::]:80;
server_name 192.168.0.103;
listen 80;
listen [::]:80;
server_name 192.168.0.103;
access_log /var/log/nginx/bigbluebutton.access.log;
access_log /var/log/nginx/bigbluebutton.access.log;
# BigBlueButton assets and static content.
location / {
root /var/www/bigbluebutton-default/assets;
index index.html index.htm;
expires 1m;
}
# This variable is used instead of $scheme by bigbluebutton nginx include
# files, so $scheme can be overridden in reverse-proxy configurations.
set $real_scheme $scheme;
# Include specific rules for record and playback
include /etc/bigbluebutton/nginx/*.nginx; # an overriding set of files, possibly present
# BigBlueButton assets and static content.
location / {
root /var/www/bigbluebutton-default/assets;
index index.html index.htm;
expires 1m;
}
# Include specific rules for record and playback
include /etc/bigbluebutton/nginx/*.nginx; # an overriding set of files, possibly present
}