From 0c1897af2d54780c194caf35507b7373bdb641f1 Mon Sep 17 00:00:00 2001
From: Patrik Kernstock <patrik@kernstock.net>
Date: Sat, 8 Aug 2020 23:02:00 +0100
Subject: [PATCH] Improved setup and README

---
 .gitignore                                         |  1 +
 README.md                                          | 14 ++++++++++----
 .../parsedmarc/{config.ini => config.sample.ini}   |  2 +-
 docker-compose.yml                                 | 10 ++++++----
 4 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore
 rename data/conf/parsedmarc/{config.ini => config.sample.ini} (94%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c767e55
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data/conf/parsedmarc/config.ini
diff --git a/README.md b/README.md
index 7bcdab6..5608d04 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,17 @@ Note: The standalone `parsedmarc` docker image can also be used, if interested:
 
 ## Setup:
 ```
-$ cd /opt/
-$ git clone https://github.com/patschi/parsedmarc-dockerized.git
-$ cd parsedmarc-dockerized/
-$ nano docker-compose.yml # Edit docker-compose.yml and change environment variables below for geoipupdate from maxmind.
+$ git clone https://github.com/patschi/parsedmarc-dockerized.git /opt/parsedmarc-dockerized/
+$ cd /opt/parsedmarc-dockerized/ && cp data/conf/parsedmarc/config.sample.ini data/conf/parsedmarc/config.ini
+
+# Create environment file for your geoipupdate API settings (fill in your data)
+$ cat > geoipupdate.env <<EOF
+GEOIPUPDATE_ACCOUNT_ID=YOUR_ACCOUNT_ID
+GEOIPUPDATE_LICENSE_KEY=YOUR_LICENSE_KEY
+EOF
+
 $ nano data/conf/parsedmarc/config.ini # Edit parsedmarc config file (and change test to False when testing done!)
+
 $ docker-compose up -d
 ```
 
diff --git a/data/conf/parsedmarc/config.ini b/data/conf/parsedmarc/config.sample.ini
similarity index 94%
rename from data/conf/parsedmarc/config.ini
rename to data/conf/parsedmarc/config.sample.ini
index a9a7705..6e5fe8a 100644
--- a/data/conf/parsedmarc/config.ini
+++ b/data/conf/parsedmarc/config.sample.ini
@@ -10,10 +10,10 @@ host = imap.example.com
 port = 993
 user = dmarcresports@example.com
 password = $uperSecure
+ssl = True
 
 # advanced
 watch = True
-ssl = True
 
 archive_folder = Processed
 delete = False
diff --git a/docker-compose.yml b/docker-compose.yml
index 7bb20d4..40fcefd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,11 +78,13 @@ services:
 
   geoipupdate:
     image: maxmindinc/geoipupdate
+    env_file:
+      - geoipupdate.env
     environment:
-      - GEOIPUPDATE_ACCOUNT_ID=TO_BE_SET
-      - GEOIPUPDATE_LICENSE_KEY=TO_BE_SET
-      - GEOIPUPDATE_EDITION_IDS=TO_BE_SET
-      - GEOIPUPDATE_FREQUENCY=24
+      - 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: