From ab1f840169c2b9a0761fe88d5d788545f109c7a4 Mon Sep 17 00:00:00 2001
From: Florian Hillebrand <mail@accolon.net>
Date: Wed, 4 Jan 2023 13:38:18 +0100
Subject: [PATCH] Simplify config of geoipupdate.

---
 README.md                 | 8 ++------
 data/conf/geoipupdate.env | 3 +++
 docker-compose.yml        | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 data/conf/geoipupdate.env

diff --git a/README.md b/README.md
index 4b05999..8d2275f 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,9 @@ cd /opt/parsedmarc-dockerized/ && cp data/conf/parsedmarc/config.sample.ini data
 nano data/conf/parsedmarc/config.ini
 ```
 
-3. Now we create an environment file, containing your geoipupdate settings from your [MaxMind account](https://www.maxmind.com/en/account/) to allow the container to pull the databases. For update cycles of the databases, please 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!)
+3. Add your geoipupdate credentials from your [MaxMind account](https://www.maxmind.com/en/account/) to allow the container to pull the databases. For update cycles of the databases, please see [here](https://support.maxmind.com/hc/en-us/articles/4408216129947).
 ```
-cat > geoipupdate.env <<EOF
-GEOIPUPDATE_ACCOUNT_ID=HERE_GOES_YOUR_ACCOUNT_ID
-GEOIPUPDATE_LICENSE_KEY=HERE_GOES_YOUR_LICENSE_KEY
-GEOIPUPDATE_FREQUENCY=24
-EOF
+nano data/conf/geoipupdate/geoipupdate.env
 ```
 
 4. Change credentials for HTTP basic auth, e.g. this way (needs apache2-utils or httpd-tools):
diff --git a/data/conf/geoipupdate.env b/data/conf/geoipupdate.env
new file mode 100644
index 0000000..c64faf6
--- /dev/null
+++ b/data/conf/geoipupdate.env
@@ -0,0 +1,3 @@
+GEOIPUPDATE_ACCOUNT_ID=your_account_id
+GEOIPUPDATE_LICENSE_KEY=your_license_key
+GEOIPUPDATE_FREQUENCY=48
diff --git a/docker-compose.yml b/docker-compose.yml
index e68626f..6d09105 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -82,7 +82,7 @@ services:
   geoipupdate:
     image: maxmindinc/geoipupdate
     env_file:
-      - geoipupdate.env
+      - ./data/conf/geoipupdate/geoipupdate.env
     environment:
       - "GEOIPUPDATE_EDITION_IDS=GeoLite2-ASN GeoLite2-City GeoLite2-Country"
       - GEOIPUPDATE_PRESERVE_FILE_TIMES=1