Merge pull request 'MAPG-203 use MULTI_WS_URL environment variable' (#10) from feature/MAPG-203-fine-tune-env-variables into develop

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/10
MAPG-203 use MULTI_WS_URL environment variable
2021-03-20 21:24:20 +01:00 · 2021-03-20 21:21:40 +01:00
2 changed files with 2 additions and 2 deletions
--- a/.env.example
+++ b/.env.example
@ -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
--- a/views/game.php
+++ b/views/game.php
@ -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>
Author	SHA1	Message	Date
Pőcze Bence	ace490b7e9	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 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/10	2021-03-20 21:24:20 +01:00
Pőcze Bence	e3771d36ce	MAPG-203 use MULTI_WS_URL environment variable All checks were successful default-pipeline default-pipeline #42 Details	2021-03-20 21:21:40 +01:00