From b721da3a118f5043a43b9fd755ffa80640fab29c Mon Sep 17 00:00:00 2001
From: Patrik Kernstock <patrik@kernstock.net>
Date: Sat, 8 Aug 2020 23:28:57 +0100
Subject: [PATCH] Fixed geoipupdate environment handling

---
 README.md          | 3 ++-
 docker-compose.yml | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 README.md
 mode change 100755 => 100644 docker-compose.yml

diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index 4897aa1..9528042
--- a/README.md
+++ b/README.md
@@ -9,11 +9,12 @@ git clone https://github.com/patschi/parsedmarc-dockerized.git /opt/parsedmarc-d
 cd /opt/parsedmarc-dockerized/ && cp data/conf/parsedmarc/config.sample.ini data/conf/parsedmarc/config.ini
 ```
 
-2. Now we create an environment file for your geoipupdate settings from your [MaxMind account](https://www.maxmind.com/en/account/) (fill in your data!)
+2. Now we create an environment file for your geoipupdate settings from your [MaxMind account](https://www.maxmind.com/en/account/). For update cycles see [here](https://support.maxmind.com/geoip-faq/geoip2-and-geoip-legacy-database-updates/how-often-are-the-geoip2-and-geoip-legacy-databases-updated/). (Fill in your data!)
 ```
 cat > geoipupdate.env <<EOF
 GEOIPUPDATE_ACCOUNT_ID=HERE_GOES_YOUR_ACCOUNT_ID
 GEOIPUPDATE_LICENSE_KEY=HERE_GOES_YOUR_LICENSE_KEY
+GEOIPUPDATE_FREQUENCY=24
 EOF
 ```
 
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100755
new mode 100644
index 40fcefd..0077572
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -81,10 +81,7 @@ services:
     env_file:
       - geoipupdate.env
     environment:
-      - GEOIPUPDATE_ACCOUNT_ID=${GEOIPUPDATE_ACCOUNT_ID}
-      - GEOIPUPDATE_LICENSE_KEY=${GEOIPUPDATE_LICENSE_KEY}
       - "GEOIPUPDATE_EDITION_IDS=GeoLite2-ASN GeoLite2-City GeoLite2-Country"
-      - GEOIPUPDATE_FREQUENCY=${GEOIPUPDATE_FREQUENCY:-24}
       - GEOIPUPDATE_PRESERVE_FILE_TIMES=1
     restart: always
     volumes: