Merge pull request #456 from linuxserver/geoip2

remove imagick, add geoip2 db update

Author: aptalca

Dockerfile

@@ -67,7 +67,6 @@ RUN \
 	php7-pdo_sqlite \
 	php7-pear \
 	php7-pecl-apcu \
-	php7-pecl-imagick \
 	php7-pecl-redis \
 	php7-pgsql \
 	php7-phar \

Dockerfile.aarch64

@@ -67,7 +67,6 @@ RUN \
 	php7-pdo_sqlite \
 	php7-pear \
 	php7-pecl-apcu \
-	php7-pecl-imagick \
 	php7-pecl-redis \
 	php7-pgsql \
 	php7-phar \

Dockerfile.armhf

@@ -67,7 +67,6 @@ RUN \
 	php7-pdo_sqlite \
 	php7-pear \
 	php7-pecl-apcu \
-	php7-pecl-imagick \
 	php7-pecl-redis \
 	php7-pgsql \
 	php7-phar \

README.md

@@ -290,6 +290,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.05.20:** - Remove `php7-pecl-imagick` due to upstream issues. Add support for `Geoip2` auto db retrieval.
 * **10.05.20:** - Added support for fail2ban deny statements.
 * **04.05.20:** - Allow for optionally setting propagation time for dns plugins. Add repo version of `whois` to replace the built-in busybox version. Update `jail.local` to change default fail2ban ban action to more widely supported `iptables-allports`.
 * **13.04.20:** - Update cloudflare.ini with token info.

readme-vars.yml

@@ -126,6 +126,7 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
+  - { date: "15.05.20:", desc: "Remove `php7-pecl-imagick` due to upstream issues. Add support for `Geoip2` auto db retrieval." }
   - { date: "10.05.20:", desc: "Added support for fail2ban deny statements." }
   - { date: "04.05.20:", desc: "Allow for optionally setting propagation time for dns plugins. Add repo version of `whois` to replace the built-in busybox version. Update `jail.local` to change default fail2ban ban action to more widely supported `iptables-allports`." }
   - { date: "13.04.20:", desc: "Update cloudflare.ini with token info." }

root/etc/cont-init.d/50-config

@@ -274,8 +274,17 @@ fi
 [[ ! -d /var/lib/libmaxminddb ]] && \
   ln -s /config/geoip2db /var/lib/libmaxminddb
 # check GeoIP2 database
-[[ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]] && \
-  echo "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please manually download/update the GeoIP2 db and save as /config/geoip2db/GeoLite2-City.mmdb"
+if [ -n "$MAXMINDDB_LICENSE_KEY" ]; then
+  sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/conf.d/libmaxminddb
+  if [ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
+    echo "Downloading GeoIP2 City database."
+    /etc/periodic/weekly/libmaxminddb
+  fi
+elif [ -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
+  echo -e "Currently using the user provided GeoLite2-City.mmdb.\nIf you want to enable weekly auto-updates of the database, retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key."
+else
+  echo -e "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key."
+fi
 
 # logfiles needed by fail2ban
 [[ ! -f /config/log/nginx/error.log ]] && \