Configuration for pixel wars

NIAEFEUP · Mar 28, 2023 · 43efc7e · 43efc7e
1 parent fc0c641
commit 43efc7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/deployments/project-configs.sh b/deployments/project-configs.sh
@@ -44,9 +44,9 @@ project_docker_flags[nijobs-be---develop]='-v /home/ni/niployments/deployments/v
 project_port[nijobs-locations---main]=4012
 project_dotenv_location[nijobs-locations---main]='/home/ni/niployments/deployments/env-files/nijobs-locations/main/.env'
 
-## pixel wars
+project_port[pixel-wars---main]=4018
+project_docker_flags[pixel-wars---develop]='--network=redis_network --env REDIS_SERVER=pixelwarsRedis'
 
-project_port[pixel-wars--main]=4018
 
 # debug example:
 # project_dotenv_location[nijobs-be---develop]='/home/miguel/Coding/NIAEFEUP/niployments/deployments/env-files/nijobs-be/develop/.env.local'

diff --git a/server-configs/apache/config-modules/routing.conf b/server-configs/apache/config-modules/routing.conf
@@ -29,9 +29,18 @@ ProxyPass /nijobs/locations http://localhost:4012
 ProxyPass /nijobs/api http://localhost:4010
 ProxyPass /nijobs http://localhost:4001
 
+<<<<<<< Updated upstream
 ProxyPass /pixelwars http://localhost:4018
 ProxyPassReverse /pixelwars/api/subscribe http://localhost:4018/api/subscribe
 
+||||||| Stash base
+=======
+ProxyPass /pixelwars/api/subscribe ws://localhost:4018/api/subscribe
+ProxyPass /pixelwars http://localhost:4018
+
+ProxyPassReverseCookieDomain "localhost" "ni.fe.up.pt"
+
+>>>>>>> Stashed changes
 ProxyPass / http://localhost:3000/
 
 ProxyPass /st4g1ng http://localhost:3001/