knot: update to 2.7.3

Signed-off-by: Daniel Salzman <daniel.salzman@nic.cz>
This commit is contained in:
Daniel Salzman
2018-08-31 15:34:57 +02:00
parent d0d4494ec5
commit 228e2d4c53
3 changed files with 31 additions and 53 deletions
+9 -9
View File
@@ -1,17 +1,17 @@
diff --git a/src/zscanner/tests/unittests.in b/src/zscanner/tests/unittests.in
index 9a4af53..f9b45bf 100644
--- a/src/zscanner/tests/unittests.in
+++ b/src/zscanner/tests/unittests.in
diff --git a/tests/libzscanner/test_zscanner.in b/tests/libzscanner/test_zscanner.in
index 2c0c27526..72b2124c7 100644
--- a/tests/libzscanner/test_zscanner.in
+++ b/tests/libzscanner/test_zscanner.in
@@ -1,15 +1,14 @@
#!/bin/sh
-SOURCE=@top_srcdir@/src/zscanner/tests
-BUILD=@top_builddir@/src/zscanner/tests
-SOURCE=@top_srcdir@/tests/libzscanner
-BUILD=@top_builddir@/tests/libzscanner
+SOURCE="."
+BUILD="/tmp/knot-test"
+mkdir -p "$BUILD"
-. @top_srcdir@/libtap/tap/libtap.sh
-. @top_srcdir@/tests/tap/libtap.sh
-
-cd "$BUILD"
+. ../tap/libtap.sh
@@ -19,7 +19,7 @@ index 9a4af53..f9b45bf 100644
TMPDIR=$(test_tmpdir)
TESTS_DIR="$SOURCE"/data
-ZSCANNER_TOOL="$BUILD"/zscanner-tool
+ZSCANNER_TOOL=./zscanner-tool
+ZSCANNER_TOOL="$SOURCE"/zscanner-tool
plan 71
plan 80
+8 -19
View File
@@ -1,24 +1,13 @@
diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in
index e07c8a7..8e057b0 100644
index 10302f958..75082f537 100644
--- a/samples/knot.sample.conf.in
+++ b/samples/knot.sample.conf.in
@@ -9,7 +9,7 @@ server:
# Listen on all configured IPv6 interfaces.
listen: ::@53
# User for running the server.
- # user: knot:knot
+ user: knot:knot
log:
# Log info and more serious events to syslog.
@@ -33,7 +33,9 @@ acl:
# action: notify
template:
-# - id: default
+ - id: default
+ max-journal-db-size: 20M
+ max-timer-db-size: 5M
# storage: "@storage_dir@"
@@ -30,6 +30,8 @@ template:
- id: default
storage: "@storage_dir@"
file: "%s.zone"
+ max-journal-db-size: 20M
+ max-timer-db-size: 5M
zone:
# # Master zone