From b39137ea0efeac0811f5ffd4562c712e963d5c83 Mon Sep 17 00:00:00 2001 From: Saalim Chashoo Date: Mon, 17 Feb 2025 15:15:22 +0530 Subject: [PATCH 1/5] chore: add maxmind env var for geoip --- .env | 3 +++ docker-compose.yml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/.env b/.env index 1620733..e6b1af7 100644 --- a/.env +++ b/.env @@ -23,6 +23,9 @@ FILE_STORE_SECRET_KEY=1password GOOGLE_CLIENT_ID=PASTE_GOOGLE_CLIENT_ID +# GeoIP MaxMind +MAXMIND_LICENSE_KEY=YOUR_LICENSE_KEY_HERE + # Traefik admin dashboard # get md5 from htpasswd or http://www.htaccesstools.com/htpasswd-generator/ diff --git a/docker-compose.yml b/docker-compose.yml index ac0cf67..5d26e15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,6 +44,9 @@ services: geoip: image: cryptlex/freegeoip:latest + environment: + MAXMIND_LICENSE_KEY: ${MAXMIND_LICENSE_KEY} + MAXMIND_ACCOUNT_ID: ${MAXMIND_ACCOUNT_ID} ports: - 8080 networks: @@ -110,6 +113,8 @@ services: REDIS_URL: # redis://cache:6379 - not required for single machine deployment GEOIPSERVER_URL: http://geoip:8080/json GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} + MAXMIND_LICENSE_KEY: ${MAXMIND_LICENSE_KEY} + MAXMIND_ACCOUNT_ID: ${MAXMIND_ACCOUNT_ID} networks: - backend restart: unless-stopped From 3c9128e8ff1742709a248cdfcda2d2ef66480bce Mon Sep 17 00:00:00 2001 From: Saalim Chashoo Date: Wed, 19 Feb 2025 12:40:47 +0530 Subject: [PATCH 2/5] chore: add maxmind accound id env var --- .env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index e6b1af7..d09e65f 100644 --- a/.env +++ b/.env @@ -24,7 +24,8 @@ FILE_STORE_SECRET_KEY=1password GOOGLE_CLIENT_ID=PASTE_GOOGLE_CLIENT_ID # GeoIP MaxMind -MAXMIND_LICENSE_KEY=YOUR_LICENSE_KEY_HERE +MAXMIND_ACCOUNT_ID =PASTE_MAXMIND_ACCOUNT_ID +MAXMIND_LICENSE_KEY=PASTE_MAXMIND_LICENSE_KEY # Traefik admin dashboard From 70ed09fb9bc6fdfb1b9729c56c065e448b6c504b Mon Sep 17 00:00:00 2001 From: Saalim Chashoo Date: Wed, 19 Feb 2025 14:11:44 +0530 Subject: [PATCH 3/5] chore: update env var for web-api service --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5d26e15..1cd3a22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,8 +113,8 @@ services: REDIS_URL: # redis://cache:6379 - not required for single machine deployment GEOIPSERVER_URL: http://geoip:8080/json GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} - MAXMIND_LICENSE_KEY: ${MAXMIND_LICENSE_KEY} - MAXMIND_ACCOUNT_ID: ${MAXMIND_ACCOUNT_ID} + MAXMIND_LICENSEKEY: ${MAXMIND_LICENSE_KEY} + MAXMIND_ACCOUNTID: ${MAXMIND_ACCOUNT_ID} networks: - backend restart: unless-stopped From d2da2e1809e1dfe63e0063e7498e7f81ed1ef266 Mon Sep 17 00:00:00 2001 From: Saalim Chashoo Date: Wed, 19 Feb 2025 14:26:56 +0530 Subject: [PATCH 4/5] chore: add space --- .env | 1 + 1 file changed, 1 insertion(+) diff --git a/.env b/.env index d09e65f..ad9747e 100644 --- a/.env +++ b/.env @@ -24,6 +24,7 @@ FILE_STORE_SECRET_KEY=1password GOOGLE_CLIENT_ID=PASTE_GOOGLE_CLIENT_ID # GeoIP MaxMind + MAXMIND_ACCOUNT_ID =PASTE_MAXMIND_ACCOUNT_ID MAXMIND_LICENSE_KEY=PASTE_MAXMIND_LICENSE_KEY From d36517c718a24d97723658024d7823584acb03d6 Mon Sep 17 00:00:00 2001 From: Saalim Chashoo Date: Wed, 19 Feb 2025 16:33:44 +0530 Subject: [PATCH 5/5] chore: remove unwanted space --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index ad9747e..dbecfa7 100644 --- a/.env +++ b/.env @@ -25,7 +25,7 @@ GOOGLE_CLIENT_ID=PASTE_GOOGLE_CLIENT_ID # GeoIP MaxMind -MAXMIND_ACCOUNT_ID =PASTE_MAXMIND_ACCOUNT_ID +MAXMIND_ACCOUNT_ID=PASTE_MAXMIND_ACCOUNT_ID MAXMIND_LICENSE_KEY=PASTE_MAXMIND_LICENSE_KEY # Traefik admin dashboard