-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
whiteboard support #1480
whiteboard support #1480
Changes from all commits
110b7fa
e586311
c495f97
e4cd2b3
4ddcd27
8cfaaa8
c2a89a3
2e85e0b
424e6c0
05848be
861c13d
8de1086
564c20c
8a29acb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -131,6 +131,20 @@ location ^~ /etherpad/ { | |
} | ||
{{ end }} | ||
|
||
{{ if .Env.WHITEBOARD_URL_BASE }} | ||
# whiteboard (excalidraw-backend) | ||
location = /socket.io/ { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's add some extra path here like excalidraw-collab/socket.io sinilar to what we do for Etherpad. |
||
tcp_nodelay on; | ||
|
||
proxy_http_version 1.1; | ||
proxy_set_header Upgrade $http_upgrade; | ||
proxy_set_header Connection "upgrade"; | ||
proxy_set_header Host $http_host; | ||
|
||
proxy_pass http://{{ .Env.WHITEBOARD_URL_BASE }}/socket.io/?$args; | ||
} | ||
{{ end }} | ||
|
||
location ~ ^/([^/?&:'"]+)$ { | ||
try_files $uri @root_path; | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -468,4 +468,8 @@ config.e2eping.maxMessagePerSecond = {{ .Env.E2EPING_MAX_MESSAGE_PER_SECOND }}; | |
// Settings for the Excalidraw whiteboard integration. | ||
if (!config.hasOwnProperty('whiteboard')) config.whiteboard = {}; | ||
config.whiteboard.enabled = {{ $WHITEBOARD_ENABLED }}; | ||
config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}'; | ||
{{ if .Env.WHITEBOARD_COLLAB_SERVER_PUBLIC_URL -}} | ||
config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}'; | ||
{{ else if .Env.WHITEBOARD_URL_BASE -}} | ||
config.whiteboard.collabServerBaseUrl = '{{ $PUBLIC_URL }}'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Adjust the URL as mentioned above. |
||
{{ end -}} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
version: '3.5' | ||
|
||
services: | ||
whiteboard: | ||
image: tgrl/excalidraw-backend:latest | ||
restart: ${RESTART_POLICY:-unless-stopped} | ||
depends_on: | ||
- web | ||
networks: | ||
meet.jitsi: | ||
aliases: | ||
- ${WHITEBOARD_URL_BASE:-whiteboard.meet.jitsi} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just "hardcode" the alias, like we do for Etherpad. There is not much of a point in changing it since it's just the internal network alias. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this still ongoing? Or is this now supported natively already? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Still ongoing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please drop these from here and make a PR to the handbook.