Browse Source

Meetpad: proxy through meetpad to etherpad.opendev.org

This makes two changes: it proxies all etherpad traffic through
the nginx running in docker in order to avoid any weird cross-domain
problems.

It also switches to using the new etherpad.opendev.org server.

Change-Id: I99f7f284088f0d241a8490d01cccdf782bdd45d2
changes/95/720095/3
James E. Blair 2 years ago
parent
commit
5a3a00f61e
  1. 2
      playbooks/roles/jitsi-meet/files/config.js
  2. 50
      playbooks/roles/jitsi-meet/files/meet.conf
  3. 5
      playbooks/roles/jitsi-meet/tasks/main.yaml

2
playbooks/roles/jitsi-meet/files/config.js

@ -251,7 +251,7 @@ var config = {
// Whether to use a welcome page or not. In case it's false a random room
// will be joined when no room is specified.
enableWelcomePage: true,
etherpad_base: 'https://etherpad.opendev.org/p/',
etherpad_base: 'https://meetpad.opendev.org/etherpad/p/',
useRoomAsSharedDocumentName: true,
openSharedDocumentOnJoin: true,

50
playbooks/roles/jitsi-meet/files/meet.conf

@ -0,0 +1,50 @@
server_name _;
client_max_body_size 0;
root /usr/share/jitsi-meet;
index index.html
error_page 404 /static/404.html;
location ~ ^/([a-zA-Z0-9=\?]+)$ {
rewrite ^/(.*)$ / break;
}
location /config.js {
alias /config/config.js;
}
location /interface_config.js {
alias /config/interface_config.js;
}
location /external_api.js {
alias /usr/share/jitsi-meet/libs/external_api.min.js;
}
location / {
ssi on;
}
# BOSH
location /http-bind {
proxy_pass http://localhost:5280/http-bind;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host localhost;
}
# Etherpad-lite
location /etherpad/ {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host 'etherpad.opendev.org';
proxy_cache_bypass $http_upgrade;
proxy_pass_header Server;
proxy_pass https://etherpad.opendev.org/;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_ssl_server_name on;
proxy_buffering off;
}

5
playbooks/roles/jitsi-meet/tasks/main.yaml

@ -8,10 +8,15 @@
path: "/var/jitsi-meet/{{ item }}"
loop:
- web
- web/nginx
- name: Write web config
copy:
src: config.js
dest: /var/jitsi-meet/web/config.js
- name: Write nginx config
copy:
src: meet.conf
dest: /var/jitsi-meet/web/nginx/meet.conf
- name: Run docker-compose pull
shell:
cmd: docker-compose pull

Loading…
Cancel
Save