From f6f419e3b1b7956b1bac3023662410c43ad7718c Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Tue, 17 Nov 2015 21:46:24 +0200 Subject: [PATCH] Update documentation --- docs/markdown/authoritative/backend-geoip.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/markdown/authoritative/backend-geoip.md b/docs/markdown/authoritative/backend-geoip.md index 496f451c4..c7b799ab5 100644 --- a/docs/markdown/authoritative/backend-geoip.md +++ b/docs/markdown/authoritative/backend-geoip.md @@ -22,7 +22,7 @@ You must have geoip database available. As of writing, on debian/ubuntu systems, These are the configuration file parameters that are available for the GeoIP backend. geoip-zones-files is the only thing you must set, if the defaults suite you. ### `geoip-database-file` -Specifies the full path of the data file for IPv4 to use. +Specifies the full path of the data file for IPv4 to use. You can use [geoip-cvs-to-dat](https://github.com/dankamongmen/sprezzos-world/blob/master/packaging/geoip/debian/src/geoip-csv-to-dat.cpp) to generate your own. ### `geoip-database-file6` Specifies the full path of the data file for IPv6 to use. @@ -70,5 +70,6 @@ domains: * **ttl**: TTL value for all records * **records**: Put fully qualified name as subkey, under which you must define at least soa: key. Note that this is an array of records, so ‐ is needed for the values. * **services**: Defines one or more services for querying. The format supports following placeholders, %% = %, %co = 3-letter country, %cn = continent, %af = v4 or v6. There are also other specifiers that will only work with suitable database and currently are untested. These are %re = region, %na = Name (such as, organisation), %ci = City. - +* Since of 4.0, you can also use additional specifiers. These are %hh = hour, %dd = day, %mo = month, %mos = month as short string, %wd = weekday (as number), %wds weekday as short string. +* Since of 4.0, scopeMask is set to most specific value, in case of date/time modifiers it will be 32 or 128, but with the others it is set to what geoip says it used for matching. You can add per-network overrides for format, they will be formatted with the same placeholders as default. Default is short-hand for adding 0.0.0.0/0 and ::/0. Default is default when only string is given for service name. -- 2.40.0