| 1 |
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 |
| 2 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/10default 2018-06-13 11:01:06.000000000 -0400 |
| 3 |
+++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/10default 2020-01-21 14:58:16.625000000 -0500 |
| 4 |
@@ -1,8 +1,8 @@ |
| 5 |
# The following AccountID and LicenseKey are required placeholders. |
| 6 |
# For geoipupdate versions earlier than 2.5.0, use UserId here instead of AccountID. |
| 7 |
#AccountID 0 |
| 8 |
-UserId 0 |
| 9 |
-LicenseKey 000000000000 |
| 10 |
+AccountID { $geoip{AccountID} ||'0' } |
| 11 |
+LicenseKey { $geoip{LicenseKey} ||'000000000000'} |
| 12 |
|
| 13 |
# Include one or more of the following edition IDs: |
| 14 |
# * GeoLite2-City - GeoLite 2 City |
| 15 |
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 |
| 16 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/20databasestore 1969-12-31 19:00:00.000000000 -0500 |
| 17 |
+++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/20databasestore 2020-01-21 15:08:28.796000000 -0500 |
| 18 |
@@ -0,0 +1,11 @@ |
| 19 |
+# The remaining settings are OPTIONAL. |
| 20 |
+ |
| 21 |
+# The directory to store the database files. Defaults to /usr/share/GeoIP |
| 22 |
+# DatabaseDirectory /usr/share/GeoIP |
| 23 |
+{ |
| 24 |
+ my $DatabaseDirectory = $geoip{DatabaseDirectory} || '/usr/share/GeoIP'; |
| 25 |
+ $OUT ="DatabaseDirectory $DatabaseDirectory"; |
| 26 |
+ |
| 27 |
+} |
| 28 |
+ |
| 29 |
+~ |
| 30 |
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 |
| 31 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/25server 1969-12-31 19:00:00.000000000 -0500 |
| 32 |
+++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/25server 2020-01-21 15:06:22.934000000 -0500 |
| 33 |
@@ -0,0 +1,7 @@ |
| 34 |
+# The server to use. Defaults to "updates.maxmind.com". |
| 35 |
+# Host updates.maxmind.com |
| 36 |
+{ |
| 37 |
+ my $GEOserver = $geoip{Host} || 'updates.maxmind.com'; |
| 38 |
+ $OUT ="Host $GEOserver"; |
| 39 |
+ |
| 40 |
+} |
| 41 |
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 |
| 42 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/30proxy 1969-12-31 19:00:00.000000000 -0500 |
| 43 |
+++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/30proxy 2020-01-21 15:03:40.668000000 -0500 |
| 44 |
@@ -0,0 +1,8 @@ |
| 45 |
+# The proxy host name or IP address. You may optionally specify a |
| 46 |
+# port number, e.g., 127.0.0.1:8888. If no port number is specified, 1080 |
| 47 |
+# will be used. |
| 48 |
+# Proxy 127.0.0.1:8888 |
| 49 |
+ |
| 50 |
+# The user name and password to use with your proxy server. |
| 51 |
+# ProxyUserPassword username:password |
| 52 |
+ |
| 53 |
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 |
| 54 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/35PreserveFileTimes 1969-12-31 19:00:00.000000000 -0500 |
| 55 |
+++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/35PreserveFileTimes 2020-01-21 15:07:19.797000000 -0500 |
| 56 |
@@ -0,0 +1,8 @@ |
| 57 |
+# Whether to preserve modification times of files downloaded from the server. |
| 58 |
+# Defaults to "0". |
| 59 |
+# PreserveFileTimes 0 |
| 60 |
+{ |
| 61 |
+ my $FT = $geoip{PreserveFileTimes} || '0'; |
| 62 |
+ $OUT ="PreserveFileTimes $FT"; |
| 63 |
+ |
| 64 |
+} |
| 65 |
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 |
| 66 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/templates/etc/GeoIP.conf/40lock 1969-12-31 19:00:00.000000000 -0500 |
| 67 |
+++ smeserver-geoip-1.2/root/etc/e-smith/templates/etc/GeoIP.conf/40lock 2020-01-21 15:03:58.969000000 -0500 |
| 68 |
@@ -0,0 +1,6 @@ |
| 69 |
+# The lock file to use. This ensures only one geoipupdate process can run at a |
| 70 |
+# time. |
| 71 |
+# Note: Once created, this lockfile is not removed from the filesystem. |
| 72 |
+# Defaults to ".geoipupdate.lock" under the DatabaseDirectory. |
| 73 |
+# LockFile /usr/share/GeoIP/.geoipupdate.lock |
| 74 |
+ |
| 75 |
diff -Nur smeserver-geoip-1.2.old/root/usr/bin/geoiplook smeserver-geoip-1.2/root/usr/bin/geoiplook |
| 76 |
--- smeserver-geoip-1.2.old/root/usr/bin/geoiplook 1969-12-31 19:00:00.000000000 -0500 |
| 77 |
+++ smeserver-geoip-1.2/root/usr/bin/geoiplook 2020-01-21 14:54:07.632000000 -0500 |
| 78 |
@@ -0,0 +1,6 @@ |
| 79 |
+#!/bin/bash |
| 80 |
+for var in "$@" |
| 81 |
+do |
| 82 |
+/usr/bin/mmdblookup --file /usr/share/GeoIP/GeoLite2-Country.mmdb --ip $1 country iso_code |cut -d\" -f2| tr -d '\n' |
| 83 |
+echo "" |
| 84 |
+done |
| 85 |
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 |
| 86 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/db/configuration/defaults/geoip/status 1969-12-31 19:00:00.000000000 -0500 |
| 87 |
+++ smeserver-geoip-1.2/root/etc/e-smith/db/configuration/defaults/geoip/status 2020-01-21 15:20:39.236000000 -0500 |
| 88 |
@@ -0,0 +1 @@ |
| 89 |
+enabled |
| 90 |
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 |
| 91 |
--- smeserver-geoip-1.2.old/root/etc/e-smith/db/configuration/defaults/geoip/type 1969-12-31 19:00:00.000000000 -0500 |
| 92 |
+++ smeserver-geoip-1.2/root/etc/e-smith/db/configuration/defaults/geoip/type 2020-01-21 15:19:31.061000000 -0500 |
| 93 |
@@ -0,0 +1 @@ |
| 94 |
+service |
Parent Directory
| 
Revision Log
| 
Revision Graph
