Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling

# Conflicts: # back/src/Services/SocketManager.ts # deeployer.libsonnet # docker-compose.yaml # front/src/Connexion/RoomConnection.ts # front/src/Enum/EnvironmentVariable.ts # front/src/Phaser/Game/GameScene.ts # front/webpack.config.js # pusher/src/Controller/IoSocketController.ts
2020-12-11 13:00:11 +01:00
parent 10e1400fc0 b1f1942807
commit 6f2c319785
59 changed files with 7667 additions and 569 deletions
@@ -54,6 +54,7 @@
      "env": {
        "API_URL": "pusher."+url,
        "UPLOADER_URL": "uploader."+url,
+        "ADMIN_URL": "admin."+url,
        "JITSI_URL": env.JITSI_URL,
        "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY,
        "TURN_SERVER": "turn:coturn.workadventu.re:443,turns:coturn.workadventu.re:443",