Added www and fixed ip logging

RobbinBaauw · Feb 2, 2019 · 0d4ab1c · 0d4ab1c
1 parent 84a4096
commit 0d4ab1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cshub-server/src/utilities/LoggingMiddleware.ts b/cshub-server/src/utilities/LoggingMiddleware.ts
@@ -6,5 +6,5 @@ import logger from "./Logger";
 export const logMiddleware = (req: Request, userObj: IJWTToken = null) => {
 
     const userData = userObj !== null ? `, uid: ${userObj.user.id}` : "";
-    logger.info(`[${req.ip}${userData}] - ${req.path}`);
+    logger.info(`[${req.headers["x-forwarded-for"] || req.connection.remoteAddress}${userData}] - ${req.path}`);
 };
diff --git a/deployment/application/docker-compose.yml b/deployment/application/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - web
     labels:
       - traefik.frontend.rule=Host:${CLIENT_HOSTNAME}
+      - traefik.frontend.rule=Host:www.${CLIENT_HOSTNAME}
       - traefik.frontend.port=${CLIENT_PORT_INTERNAL}
     environment:
       - VUE_APP_API_URL=${CLIENT_ENV_API_URL}