Change shittyserver's WS to go via thunderhorn

Note that this will require a shittyserver deploy and restart because it used to bind to "127.0.0.1" but no longer does
This commit is contained in:
Marks Polakovs 2020-06-14 19:12:56 +02:00
parent f8bff640b9
commit 4f973539ce
4 changed files with 4 additions and 4 deletions

2
.env
View file

@ -3,4 +3,4 @@ REACT_APP_VERSION=$npm_package_version
REACT_APP_MYRADIO_NONAPI_BASE=https://ury.org.uk/myradio-staging REACT_APP_MYRADIO_NONAPI_BASE=https://ury.org.uk/myradio-staging
REACT_APP_MYRADIO_BASE=https://ury.org.uk/api-staging/v2 REACT_APP_MYRADIO_BASE=https://ury.org.uk/api-staging/v2
REACT_APP_BROADCAST_API_BASE=https://ury.org.uk/webstudio/api/v1 REACT_APP_BROADCAST_API_BASE=https://ury.org.uk/webstudio/api/v1
REACT_APP_WS_URL=wss://audio.ury.org.uk/webstudio/stream REACT_APP_WS_URL=wss://ury.org.uk/webstudio/api/stream

View file

@ -2,4 +2,4 @@ REACT_APP_VERSION=$npm_package_version
REACT_APP_MYRADIO_NONAPI_BASE=https://ury.org.uk/myradio REACT_APP_MYRADIO_NONAPI_BASE=https://ury.org.uk/myradio
REACT_APP_MYRADIO_BASE=https://ury.org.uk/api/v2 REACT_APP_MYRADIO_BASE=https://ury.org.uk/api/v2
REACT_APP_BROADCAST_API_BASE=https://ury.org.uk/webstudio/api/v1 REACT_APP_BROADCAST_API_BASE=https://ury.org.uk/webstudio/api/v1
REACT_APP_WS_URL=wss://audio.ury.org.uk/webstudio/stream REACT_APP_WS_URL=wss://ury.org.uk/webstudio/api/stream

2
Jenkinsfile vendored
View file

@ -67,7 +67,7 @@ pipeline {
environment { environment {
REACT_APP_MYRADIO_NONAPI_BASE = 'https://ury.org.uk/myradio' REACT_APP_MYRADIO_NONAPI_BASE = 'https://ury.org.uk/myradio'
REACT_APP_MYRADIO_BASE = 'https://ury.org.uk/api/v2' REACT_APP_MYRADIO_BASE = 'https://ury.org.uk/api/v2'
REACT_APP_WS_URL = 'wss://audio.ury.org.uk/webstudio/stream' REACT_APP_WS_URL = 'wss://ury.org.uk/webstudio/api/stream'
} }
steps { steps {
sh 'sed -i -e \'s/ury.org.uk\\/webstudio-dev/ury.org.uk\\/webstudio/\' package.json' sh 'sed -i -e \'s/ury.org.uk\\/webstudio-dev/ury.org.uk\\/webstudio/\' package.json'

View file

@ -366,7 +366,7 @@ async def serve(websocket: websockets.WebSocketServerProtocol, path: str) -> Non
start_server = websockets.serve( start_server = websockets.serve(
serve, "localhost", int(config.get("shittyserver", "websocket_port")) serve, host=None, port=int(config.get("shittyserver", "websocket_port"))
) )
print("Shittyserver WS starting on port {}.".format(config.get("shittyserver", "websocket_port"))) print("Shittyserver WS starting on port {}.".format(config.get("shittyserver", "websocket_port")))