fixup! fixup! manager: files: watchdog: added RPZ files

Author: alesmrazek

tests/packaging/interactive/rpz_watchdog.sh

@@ -4,14 +4,6 @@ set -e
 
 gitroot=$(git rev-parse --show-toplevel)
 rpz_file=$gitroot/example.rpz
-rpz_conf="[{ 'file': '$rpz_file' }]"
-
-rpz_conf=$(cat <<EOF
-{ "rpz": [
-  { "file": "$rpz_file" }
-]}
-EOF
-)
 
 rpz_example=$(cat <<EOF
 \$ORIGIN RPZ.EXAMPLE.ORG.
@@ -22,8 +14,16 @@ EOF
 # create example RPZ
 echo "$rpz_example" >> $rpz_file
 
+rpz_conf=$(cat <<EOF
+local-data:
+  rpz:
+    - file: $rpz_file
+      watchdog: false
+EOF
+)
+
 # configure RPZ file
-kresctl config set -p /local-data "$rpz_conf"
+echo "$rpz_conf" >> /etc/knot-resolver/config.yaml
 if [ "$?" -ne "0" ]; then
     echo "Could not set RPZ."
     exit 1
@@ -37,12 +37,11 @@ function count_reloads(){
     echo "$(journalctl -u knot-resolver.service | grep -c "Policy rules reloaded")"
 }
 
-# test that files watchdog is turned off
+# test that RPZ watchdog is turned off
 # {{
 
 err_count=$(count_errors)
 rel_count=$(count_reloads)
-sleep 6
 
 if [ $(count_errors) -ne $err_count ] || [ $(count_reloads) -ne $rel_count ]; then
     echo "RPZ file watchdog is running (should not) or other errors occurred."
@@ -61,9 +60,7 @@ fi
 # test modification
 # {{
 
-rel_count=$(count_reloads)
-
-# modify certificate files with '-', it will trigger reload
+# modify RPZ file, it will trigger reload
 rel_count=$(count_reloads)
 echo "32.1.2.0.192.rpz-client-ip        CNAME rpz-passthru." >> $rpz_file