diff --git a/src/server/Master.ts b/src/server/Master.ts index e6ded5047..dc84b29bd 100644 --- a/src/server/Master.ts +++ b/src/server/Master.ts @@ -234,11 +234,9 @@ async function schedulePublicGame() { method: "POST", headers: { "Content-Type": "application/json", - "X-Internal-Request": "true", [config.adminHeader()]: config.adminToken(), }, body: JSON.stringify({ - gameID: gameID, gameConfig: defaultGameConfig, }), }, diff --git a/src/server/Worker.ts b/src/server/Worker.ts index 74c16794d..b667f7088 100644 --- a/src/server/Worker.ts +++ b/src/server/Worker.ts @@ -81,10 +81,10 @@ export function startWorker() { const gc = req.body?.gameConfig as GameConfig; if ( gc?.gameType == GameType.Public && - req.headers[config.adminHeader()] != config.adminToken() + req.headers[config.adminHeader()] !== config.adminToken() ) { console.warn( - `cannot create public game ${id}, ip ${clientIP} not localhost`, + `cannot create public game ${id}, ip ${clientIP} incorrect admin token`, ); return res.status(400); } diff --git a/src/server/gatekeeper b/src/server/gatekeeper index 523c784e6..089ff9e29 160000 --- a/src/server/gatekeeper +++ b/src/server/gatekeeper @@ -1 +1 @@ -Subproject commit 523c784e625dc57ca81343010af158216163d96f +Subproject commit 089ff9e297d590ef997d11681668017b2ef7f200 diff --git a/update-deploy.sh b/update-deploy.sh index e09f94c93..bc83999b0 100755 --- a/update-deploy.sh +++ b/update-deploy.sh @@ -84,6 +84,10 @@ chmod +x $UPDATE_SCRIPT # Copy the update script to the EC2 instance scp -i $EC2_KEY $UPDATE_SCRIPT $EC2_HOST:$REMOTE_UPDATE_SCRIPT +scp -i $EC2_KEY .env $EC2_HOST:/home/ec2-user/.env +# After copying the .env file, secure it +ssh -i $EC2_KEY $EC2_HOST "chmod 600 /home/ec2-user/.env" + if [ $? -ne 0 ]; then echo "❌ Failed to copy update script to EC2 instance. Stopping deployment." exit 1 diff --git a/update.sh b/update.sh index 5f0d6c50c..05ee3f73e 100755 --- a/update.sh +++ b/update.sh @@ -69,6 +69,7 @@ docker run -d -p 80:80 \ --log-opt awslogs-group=${LOG_GROUP} \ --log-opt awslogs-create-group=true \ --env GAME_ENV=${ENV} \ + --env-file /home/ec2-user/.env \ --name ${CONTAINER_NAME} \ $ECR_REPO