fix #96

Author: olback

.env.sample

@@ -6,8 +6,12 @@
 NODE_PORT=5000
 NODE_ENV=production
 NODE_COMMAND=npm start
+# Set to <your-domain>:port
+# Local testing example: localhost:5000
+# Production server example: <domain>:443
+NODE_SERVER_ADDR=localhost:5000
 
-# PostgreSQL
+# PostgreSQL (don't change these unless you know what you're doing)
 PG_USER=cah
 PG_HOST=postgres
 PG_PORT=5432

docker-compose.yml

@@ -15,6 +15,7 @@ services:
     environment:
       NODE_PORT: ${NODE_PORT}
       NODE_ENV: ${NODE_ENV}
+      NODE_SERVER_ADDR: ${NODE_SERVER_ADDR}
       PG_USER: ${PG_USER}
       PG_HOST: ${PG_HOST}
       PG_PORT: ${PG_PORT}

scripts/setup.sh

@@ -24,7 +24,8 @@ docker exec $(docker ps | grep ${NAME}_postgres | rev | cut -d ' ' -f 1 | rev) "
 
 # Restart the containers
 docker-compose down
-docker-compose up -d
+# docker-compose up -d
+# PORT=$(cat .env | grep NODE_PORT | cut -b 11-15)
+# echo "Done. Running on port $PORT"
 
-PORT=$(cat .env | grep NODE_PORT | cut -b 11-15)
-echo "Done. Running on port $PORT"
+echo "Done"

server/src/server.ts

@@ -21,7 +21,7 @@ const server = app.listen(port, () => {
 });
 
 const io = socketio(server, {
-    origins: env.NODE_ENV === 'production' ? ['cah.ninja:443'] : ['*:*']
+    origins: env.NODE_ENV === 'production' && typeof env.NODE_SERVER_ADDR === 'string' ? [env.NODE_SERVER_ADDR] : ['*:*']
 });
 
 const games: Games = {};

setup.md

@@ -4,7 +4,9 @@
 1. Make sure that `docker`, `docker-compose` and `node` is installed.
 2. Clone this repo. `git clone [email protected]:olback/cah cah && cd cah`.
 3. Run `scripts/setup.sh`.
-4. That's it. You can now access the game on [localhost:5000](http://localhost:5000).
+4. Look over and edit `.env` to your liking.
+5. Run `docker-compose up` to start the server. (add `-d` to run in the background)
+6. That's it. You can now access the game on [localhost:5000](http://localhost:5000).
 
 ## Development:
 1. Make sure that `docker`, `docker-compose` and `node` is installed.