[SCM] proftpd-mod-geoip branch, master, updated. upstream/0.2-10-ge0fe196

Thu Mar 17 17:17:28 UTC 2011

The following commit has been merged in the master branch:
commit e0fe196f3b414bd64ce8d4d758df9e7e9d2b7a75
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Thu Mar 17 18:15:03 2011 +0100

    Switch to 3.0 quilt format / Added templates / Removed postrm script

diff --git a/debian/proftpd-mod-geoip.dirs b/debian/proftpd-mod-geoip.dirs
index 669898d..f0e8d4e 100644
--- a/debian/proftpd-mod-geoip.dirs
+++ b/debian/proftpd-mod-geoip.dirs
@@ -1 +1,2 @@
 usr/lib/proftpd
+usr/share/proftpd/templates
diff --git a/debian/proftpd-mod-geoip.install b/debian/proftpd-mod-geoip.install
new file mode 100644
index 0000000..e4d2f95
--- /dev/null
+++ b/debian/proftpd-mod-geoip.install
@@ -0,0 +1 @@
+debian/templates/geoip.conf usr/share/doc/proftpd-mod-geoip/
diff --git a/debian/proftpd-mod-geoip.links b/debian/proftpd-mod-geoip.links
new file mode 100644
index 0000000..411f03d
--- /dev/null
+++ b/debian/proftpd-mod-geoip.links
@@ -0,0 +1 @@
+usr/share/doc/proftpd-mod-geoip/geoip.conf usr/share/proftpd/templates/geoip.conf
diff --git a/debian/rules b/debian/rules
index 4d1555d..71ef045 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ clean:
 	$(RM) $(MODULE_NAME).a *.o *.la *.lo
 	$(LIBTOOL) --mode=clean $(RM) "$(MODULE_NAME).o"
 	$(LIBTOOL) --mode=clean $(RM) `echo "$(MODULE_NAME).la" | sed 's/\.la$\/.lo/g'`
-	$(RM) -rf $(CURDIR)/debian/proftpd-mod-geoip $(CURDIR)/debian/*.log $(CURDIR)/debian/files $(CURDIR)/debian/*.substvars
+	$(RM) -rf $(CURDIR)/debian/proftpd-mod-geoip $(CURDIR)/debian/*.log $(CURDIR)/debian/files $(CURDIR)/debian/substvars
 
 distclean: clean
 	$(RM) -r .libs/ 
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/debian/templates/geoip.conf b/debian/templates/geoip.conf
new file mode 100644
index 0000000..4bb1d67
--- /dev/null
+++ b/debian/templates/geoip.conf
@@ -0,0 +1,101 @@
+#
+# Proftpd sample configuration for geoip.
+#
+<IfModule mod_geoip.c>
+
+# GeoIPEngine
+# Syntax: GeoIPEngine on|off
+# Default: off
+# The GeoIPEngine directive enables or disables the module's lookup of geographic information for a
+# connecting client, and subsequent enforcement of any configured ACLs.
+GeoIPEngine on
+
+
+# Syntax: GeoIPAllowFilter filter pattern
+# Default: none
+# The GeoIPAllowFilter directive is used to configure ACLs based on the 
+# geographic data provided by the GeoIP library.
+# Multiple GeoIPAllowFilter directives in the configuration are supported;
+# if any filter matches the connecting client, the connection will be allowed.
+# The filter parameter specifies the GeoIP value to which to apply the configured
+# pattern for matching. The possible filter values are:
+#  * AreaCode
+#  * ASN
+#  * City
+#  * Continent
+#  * CountryCode
+#  * CountryCode3
+#  * CountryName
+#  * ISP
+#  * Latitude
+#  * Longitude
+#  * NetworkSpeed
+#  * Organization
+#  * PostalCode
+#  * Proxy
+#  * RegionCode
+#  * RegionName
+#  * Timezone 
+# The pattern parameter is case-insensitive regular expression that will be applied to the 
+# specified filter value, if available.
+# Examples: 
+
+# Allow clients with high-speed connections
+# GeoIPAllowFilter NetworkSpeed corporate
+
+# Reject clients connecting from North America or South America
+# GeoIPDenyFilter Continent (NA|SA)
+
+# GeoIPDenyFilter
+# Syntax: GeoIPDenyFilter filter pattern
+# Default: none
+# The GeoIPDenyFilter directive is used to configure ACLs based on the geographic data provided by 
+# the GeoIP library.
+# Multiple GeoIPDenyFilter directives in the configuration are supported; if any filter matches the 
+# connecting client, the connection will be rejected. 
+# See GeoIPAllowFilter for a description of the directive syntax and parameters. 
+
+# GeoIPLog
+# Syntax: GeoIPLog file|"none"
+# Default: None
+# The GeoIPLog directive is used to specify a log file for mod_geoip's reporting on a per-server basis.
+# The file parameter given must be the full path to the file to use for logging.
+# Note that this path must not be to a world-writable directory and, unless AllowLogSymlinks is explicitly
+# set to on (generally a bad idea), the path must not be a symbolic link. 
+GeoIPLog /var/log/proftpd/geoip.log
+
+# GeoIPTable
+# Syntax: GeoIPTable path [flags]
+# Default: None
+# The GeoIPTable directive is used to a GeoIP database file for use by the GeoIP library. The path parameter given must be the full path to the database file.
+# If no GeoIPTable directive is configured, then the GeoIP library will use the default GeoIP Country database file installed with the library. 
+# Otherwise, only the database files configured via GeoIPTable directives will be used.
+# Multiple GeoIPTable directives can be used to configure multiple different GeoIP database files for use at the same time.
+# The possible flags values supported are:
+#   * Standard
+# Reads the database from the filesystem; uses the least memory but causes database to be read for each connection.
+#  * MemoryCache
+# Loads the database into memory; faster performance but uses the most memory. Tables configured with MemoryCache are loaded into the parent process memory, avoiding 
+# the need to read them for each connection.
+#  * CheckCache
+#      Causes the GeoIP library to check for database updates. If the database has been updated, the library will automatically reload the file and/or memory cache.
+#  * IndexCache
+# Loads just the most frequently accessed index portion of the database into memory, resulting in faster lookups than Standard but less memory usage than MemoryCache. 
+# This can be useful for larger databases such as GeoIP Organization and GeoIP City.
+#  * MMapCache
+#  Loads the database into mmap shared memory.
+#  * UTF8
+#   Tells the GeoIP library to return UTF8 strings for the data obtained from this database file. By default, the GeoIP library uses ISO-8859-1 encoded strings. 
+# Multiple different flags can be configured.
+# Examples:
+# GeoIPTable /path/to/GeoIP.dat MemoryCache CheckCache
+# GeoIPTable /path/to/GeoISP.dat Standard
+# GeoIPTable /path/to/GeoIPCity.dat IndexCache
+# Load GeoIP city database into memory on server startup, and use
+# UTF8-encoded city names
+GeoIPTable /usr/share/GeoIP/GeoIP.dat MemoryCache UTF8
+
+# Add your GeoIPAllowFilter/GeoIPDenyFilter rules here
+</IfModule>
+
+

-- 
mod_geoip for proftpd

