Mailing List Archive

svn commit: r1863531 - /spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
Author: hege
Date: Sun Jul 21 17:12:07 2019
New Revision: 1863531

URL: http://svn.apache.org/viewvc?rev=1863531&view=rev
Log:
Check for GeoIP2 City.mmdb also

Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?rev=1863531&r1=1863530&r2=1863531&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Sun Jul 21 17:12:07 2019
@@ -133,6 +133,7 @@ If not defined, GeoIP2 default search in
/usr/local/share/GeoIP/GeoLite2-Country.mmdb
/usr/share/GeoIP/GeoLite2-Country.mmdb
/var/lib/GeoIP/GeoLite2-Country.mmdb
+ (and same paths again for -City.mmdb)

=back

@@ -165,6 +166,12 @@ If not defined, GeoIP2 default search in
'/usr/local/share/GeoIP/GeoLite2-Country.mmdb',
'/usr/share/GeoIP/GeoLite2-Country.mmdb',
'/var/lib/GeoIP/GeoLite2-Country.mmdb',
+ '/usr/local/share/GeoIP/GeoIP2-City.mmdb',
+ '/usr/share/GeoIP/GeoIP2-City.mmdb',
+ '/var/lib/GeoIP/GeoIP2-City.mmdb',
+ '/usr/local/share/GeoIP/GeoLite2-City.mmdb',
+ '/usr/share/GeoIP/GeoLite2-City.mmdb',
+ '/var/lib/GeoIP/GeoLite2-City.mmdb',
],
type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRINGLIST,
code => sub {