From 90c6d920501b157c4de6761798a70ecd40552f40 Mon Sep 17 00:00:00 2001
From: Dewet Diener <dewet22@users.noreply.github.com>
Date: Mon, 11 May 2020 13:09:22 +0100
Subject: [PATCH] [blocky] Improve values.yaml documentation (#220)

* Improve values.yaml documentation

Also fix syntax error for declaring extraLists -- it needs to be a map, not an array

* bump blocky bugfix version
---
 charts/blocky/Chart.yaml  |  2 +-
 charts/blocky/values.yaml | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/charts/blocky/Chart.yaml b/charts/blocky/Chart.yaml
index ff25d206..75bf839a 100644
--- a/charts/blocky/Chart.yaml
+++ b/charts/blocky/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v0.6"
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 3.1.0
+version: 3.1.1
 keywords:
   - blocky
   - dbs
diff --git a/charts/blocky/values.yaml b/charts/blocky/values.yaml
index d8bb609c..4b9fb5df 100644
--- a/charts/blocky/values.yaml
+++ b/charts/blocky/values.yaml
@@ -49,7 +49,11 @@ config:
         - https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
       special:
         - https://hosts-file.net/ad_servers.txt
-    # definition of whitelist groups. Attention: if the same group has black and whitelists, whitelists will be used to disable particular blacklist entries. If a group has only whitelist entries -> this means only domains from this list are allowed, all other domains will be blocked
+    # definition of whitelist groups. Attention: if the same group has black and whitelists,
+    # whitelists will be used to disable particular blacklist entries. If a group has only
+    # whitelist entries -> this means only domains from this list are allowed,
+    # all other domains will be blocked.
+    # Also see the extraLists section below to add your own in-line whitelists
     # whiteLists:
     #   ads:
     #     - whitelist.txt
@@ -62,10 +66,12 @@ config:
       # use client name or ip address
       # laptop.fritz.box:
       #   - ads
+
     # which response will be sent, if query is blocked:
-    # zeroIp: 0.0.0.0 will be returned (default)
-    # nxDomain: return NXDOMAIN as return code
+    #   zeroIp: 0.0.0.0 will be returned (default)
+    #   nxDomain: return NXDOMAIN as return code
     # blockType: zeroIp
+
     # optional: automatically list refresh period in minutes. Default: 4h.
     # Negative value -> deactivate automatically refresh.
     # 0 value -> use default
@@ -174,7 +180,9 @@ tolerations: []
 
 affinity: {}
 
-## Add any extra files you want populated to /app here
-# ex:
-# - whitelist.txt: "line1"
+## Add any extra files you want populated to /app here, e.g.:
+#  extraLists:
+#    whitelist.txt: |
+#      analytics.google.com
+#      googleadservices.com
 extraLists: {}