diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/10default smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/10default --- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/10default 2018-06-13 11:01:06.000000000 -0400 +++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/10default 2020-01-21 14:58:16.625000000 -0500 @@ -1,8 +1,8 @@ # The following AccountID and LicenseKey are required placeholders. # For geoipupdate versions earlier than 2.5.0, use UserId here instead of AccountID. #AccountID 0 -UserId 0 -LicenseKey 000000000000 +AccountID { $geoip{AccountID} ||'0' } +LicenseKey { $geoip{LicenseKey} ||'000000000000'} # Include one or more of the following edition IDs: # * GeoLite2-City - GeoLite 2 City diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/20databasestore smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/20databasestore --- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/20databasestore 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/20databasestore 2020-01-21 15:08:28.796000000 -0500 @@ -0,0 +1,11 @@ +# The remaining settings are OPTIONAL. + +# The directory to store the database files. Defaults to /usr/share/GeoIP +# DatabaseDirectory /usr/share/GeoIP +{ + my $DatabaseDirectory = $geoip{DatabaseDirectory} || '/usr/share/GeoIP'; + $OUT ="DatabaseDirectory $DatabaseDirectory"; + +} + +~ diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/25server smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/25server --- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/25server 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/25server 2020-01-21 15:06:22.934000000 -0500 @@ -0,0 +1,7 @@ +# The server to use. Defaults to "updates.maxmind.com". +# Host updates.maxmind.com +{ + my $GEOserver = $geoip{Host} || 'updates.maxmind.com'; + $OUT ="Host $GEOserver"; + +} diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/30proxy smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/30proxy --- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/30proxy 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/30proxy 2020-01-21 15:03:40.668000000 -0500 @@ -0,0 +1,8 @@ +# The proxy host name or IP address. You may optionally specify a +# port number, e.g., 127.0.0.1:8888. If no port number is specified, 1080 +# will be used. +# Proxy 127.0.0.1:8888 + +# The user name and password to use with your proxy server. +# ProxyUserPassword username:password + diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/35PreserveFileTimes smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/35PreserveFileTimes --- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/35PreserveFileTimes 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/35PreserveFileTimes 2020-01-21 15:07:19.797000000 -0500 @@ -0,0 +1,8 @@ +# Whether to preserve modification times of files downloaded from the server. +# Defaults to "0". +# PreserveFileTimes 0 +{ + my $FT = $geoip{PreserveFileTimes} || '0'; + $OUT ="PreserveFileTimes $FT"; + +} diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/40lock smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/40lock --- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/40lock 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/40lock 2020-01-21 15:03:58.969000000 -0500 @@ -0,0 +1,6 @@ +# The lock file to use. This ensures only one geoipupdate process can run at a +# time. +# Note: Once created, this lockfile is not removed from the filesystem. +# Defaults to ".geoipupdate.lock" under the DatabaseDirectory. +# LockFile /usr/share/GeoIP/.geoipupdate.lock + diff -Nur smeserver-geoip-1.2.old/root/usr/bin/geoiplook smeserver-geoip-1.2/root/usr/bin/geoiplook --- smeserver-geoip-1.2.old/root/usr/bin/geoiplook 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/usr/bin/geoiplook 2020-01-21 14:54:07.632000000 -0500 @@ -0,0 +1,6 @@ +#!/bin/bash +for var in "$@" +do +/usr/bin/mmdblookup --file /usr/share/GeoIP/GeoLite2-Country.mmdb --ip $1 country iso_code |cut -d\" -f2| tr -d '\n' +echo "" +done diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/db/configuration/defaults/geoip/status smeserver-geoip-1.2/root/etc/e-smith/db/configuration/defaults/geoip/status --- smeserver-geoip-1.2.old/root/etc/e-smith/db/configuration/defaults/geoip/status 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/etc/e-smith/db/configuration/defaults/geoip/status 2020-01-21 15:20:39.236000000 -0500 @@ -0,0 +1 @@ +enabled diff -Nur smeserver-geoip-1.2.old/root/etc/e-smith/db/configuration/defaults/geoip/type smeserver-geoip-1.2/root/etc/e-smith/db/configuration/defaults/geoip/type --- smeserver-geoip-1.2.old/root/etc/e-smith/db/configuration/defaults/geoip/type 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-geoip-1.2/root/etc/e-smith/db/configuration/defaults/geoip/type 2020-01-21 15:19:31.061000000 -0500 @@ -0,0 +1 @@ +service