Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-25 01:06:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1530 from bostrt/tls-websockets

Browse source 
Update websocket URL so proxy port can be utilized. Resolves #1421.
This commit is contained in:
Griatch 2017-12-15 23:39:09 +01:00 • committed by GitHub
commit aca4605d47
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/settings_default.py
View file

@ -94,9 +94,9 @@ WEBSOCKET_CLIENT_PORT = 4005
WEBSOCKET_CLIENT_INTERFACE = '0.0.0.0'
# Actual URL for webclient component to reach the websocket. You only need
# to set this if you know you need it, like using some sort of proxy setup.
# If given it must be on the form "ws://hostname" (WEBSOCKET_CLIENT_PORT will
# be automatically appended). If left at None, the client will itself
# figure out this url based on the server's hostname.
# If given it must be on the form "ws[s]://hostname[:port]". If left at None,
# the client will itself figure out this url based on the server's hostname.
# e.g. ws://external.example.com or wss://external.example.com:443
WEBSOCKET_CLIENT_URL = None
# This determine's whether Evennia's custom admin page is used, or if the
# standard Django admin is used.

2
evennia/web/webclient/templates/webclient/base.html
View file

@ -44,7 +44,7 @@ JQuery available.
{% endif %}
{% if websocket_url %}
var wsurl = "{{websocket_url}}:{{websocket_port}}";
var wsurl = "{{websocket_url}}";
{% else %}
var wsurl = "ws://" + this.location.hostname + ":{{websocket_port}}";
{% endif %}