Merge pull request 'MAPG-203 use MULTI_WS_URL environment variable' (#10) from feature/MAPG-203-fine-tune-env-variables into develop
All checks were successful
default-pipeline default-pipeline #43

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/10
This commit is contained in:
Bence Pőcze 2021-03-20 21:24:20 +01:00 committed by Gitea
commit ace490b7e9
No known key found for this signature in database
GPG Key ID: 2E27A8C281A1CC2C
2 changed files with 2 additions and 2 deletions

View File

@ -17,5 +17,5 @@ GOOGLE_OAUTH_CLIENT_SECRET=your_google_oauth_client_secret
GOOGLE_ANALITICS_ID=your_google_analytics_id
MULTI_INTERNAL_HOST=multi
MULTI_INTERNAL_PORT=5000
MULTI_WS_HOST=mapguesser-dev.ch
MULTI_WS_URL=mapguesser-dev.ch:8090
MULTI_WS_PORT=8090

View File

@ -59,7 +59,7 @@
@section(pageScript)
<script>
var multiUrl = '<?= $_ENV['MULTI_WS_HOST'] . ':' . $_ENV['MULTI_WS_PORT'] ?>';
var multiUrl = '<?= $_ENV['MULTI_WS_URL'] ?>';
var roomId = <?= isset($roomId) ? '\'' . $roomId . '\'' : 'null' ?>;
var mapId = <?= isset($mapId) ? '\'' . $mapId . '\'' : 'null' ?>;
</script>