etc/config.*: tweak the config examples

The main impulse was to have 'hints > iterate', as people usually expect
hints to take precendence before cache.

diff --git a/etc/config.cluster b/etc/config.cluster
index 584837922b0a47e3a1e1df6a6b151a61a46289d9..86475873645a05ff4739c07f9cb1987700e56d66 100644 (file)
--- a/etc/config.cluster
+++ b/etc/config.cluster
@@ -20,8 +20,7 @@ cache.size = 100 * GB
 
 -- Load Useful modules
 modules = {
-       'policy',   -- Block queries to local zones/bad sites
-       'hints',    -- Load /etc/hosts and allow custom root hints
+       'hints > iterate', -- Load /etc/hosts and allow custom root hints
        'stats',    -- Track internal statistics
        graphite = { -- Send statistics to local InfluxDB
                -- `worker.id` allows us to keep per-fork statistics
@@ -29,7 +28,6 @@ modules = {
                -- Address of the Graphite/InfluxDB server
                host = '192.168.1.2',
        },
-       'redis',   -- Allow to use Redis as a cache backend
 }
 
 -- Use local root server copy for performance reasons
@@ -40,5 +38,3 @@ hints.root({
 -- Apply RPZ for all clients, default rule is DENY
 policy.add(policy.rpz(policy.DENY, 'blacklist.rpz'))
 
--- Optional: use Redis/Memcached as a cache backend which may be distributed between nodes
--- cache.storage = 'redis://127.0.0.1:6398'

diff --git a/etc/config.docker b/etc/config.docker
index 0eb33b22876ab0f1a6c2e2ab61386e091d61a605..05016726433bda66b1a33157831b21881be5e725 100644 (file)
--- a/etc/config.docker
+++ b/etc/config.docker
@@ -9,13 +9,12 @@ trust_anchors.file = '/etc/knot-resolver/root.keys'
 
 -- Load Useful modules
 modules = {
-       'policy',   -- Block queries to local zones/bad sites
        'stats',    -- Track internal statistics
        -- Load HTTP module with defaults
-        http = {
-                host = '0.0.0.0',
-                port = 8053,
-        }
+       http = {
+               host = '0.0.0.0',
+               port = 8053,
+       },
 }
 
 -- Smaller cache size

diff --git a/etc/config.isp b/etc/config.isp
index c5ba83004bab4e142a9cff10a6150eff32a4ded4..27dc76e3eea52af66f1d8def109a7758b08de8c6 100644 (file)
--- a/etc/config.isp
+++ b/etc/config.isp
@@ -17,16 +17,15 @@ cache.size = 4 * GB
 
 -- Load Useful modules
 modules = {
-       'policy',   -- Block queries to local zones/bad sites
        'view',     -- Views for certain clients
-       'hints',    -- Load /etc/hosts and allow custom root hints
+       'hints > iterate', -- Load /etc/hosts and allow custom root hints
        'stats',    -- Track internal statistics
        graphite = { -- Send statistics to local InfluxDB
                -- `worker.id` allows us to keep per-fork statistics
                prefix = hostname()..worker.id,
                -- Address of the Graphite/InfluxDB server
                host = '192.168.1.2',
-       }
+       },
 }
 
 -- Block all `site.nl` for `10.0.0.0/24` subnet

diff --git a/etc/config.personal b/etc/config.personal
index 490798e22120da32742379923bc21317893a63fc..74bdd0eebafeda5a1fbd31d2c1031e822fcf5f1f 100644 (file)
--- a/etc/config.personal
+++ b/etc/config.personal
@@ -14,8 +14,7 @@ trust_anchors.file = 'root.keys'
 
 -- Load Useful modules
 modules = {
-       'policy',   -- Block queries to local zones/bad sites
-       'hints',    -- Load /etc/hosts and allow custom root hints
+       'hints > iterate', -- Load /etc/hosts and allow custom root hints
        'stats',    -- Track internal statistics
        'predict',  -- Prefetch expiring/frequent records
 }

diff --git a/etc/config.splitview b/etc/config.splitview
index 1706a498a61a1d9841917b0af6051029f2b15ae4..fbd0140216a72b4aac5879f1ff23ea9890214ba2 100644 (file)
--- a/etc/config.splitview
+++ b/etc/config.splitview
@@ -12,8 +12,7 @@ trust_anchors.file = 'root.keys'
 
 -- Load Useful modules
 modules = {
-       'policy',   -- Block queries to local zones/bad sites
-       'hints',    -- Load /etc/hosts and allow custom root hints
+       'hints > iterate', -- Load /etc/hosts and allow custom root hints
        'stats',    -- Track internal statistics
        graphite = { -- Send statistics to local InfluxDB
                -- `worker.id` allows us to keep per-fork statistics