From 946804f3beabb2367474b15bcb173c1fc53265d6 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Mon, 22 Jul 2013 17:54:22 +0530 Subject: [PATCH 01/10] [3020] Fix text that was broken and lost from commit f3b0c13a --- doc/guide/bind10-guide.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index 432fb8d2d7..85b87aefe5 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2601,6 +2601,12 @@ can use various data source backends. > config set data_sources/classes/IN[1]/params { "example.org": "/path/to/example.org", "example.com": "/path/to/example.com" } > config commit + Unfortunately, due to current technical limitations, the + params must be set as one JSON blob. To reload a zone, you the + same Auth loadzone command as above. + + + Initially, a map value has to be set, but this value may be an empty map. After that, key/value pairs can be added with 'config add' and keys can be removed with 'config remove'. The initial @@ -2614,8 +2620,6 @@ can use various data source backends. > config remove data_sources/classes/IN[1]/params another.example.org - bindctl. To reload a zone, you the same command - as above. From a1df84adccebfc6e3f6625aef58f1c9f31cd3eea Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Mon, 22 Jul 2013 17:55:32 +0530 Subject: [PATCH 02/10] [3020] Format commands properly --- doc/guide/bind10-guide.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index 85b87aefe5..b7eb5025ff 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2608,10 +2608,11 @@ can use various data source backends. Initially, a map value has to be set, but this value may be an - empty map. After that, key/value pairs can be added with 'config - add' and keys can be removed with 'config remove'. The initial - value may be an empty map, but it has to be set before zones are - added or removed. + empty map. After that, key/value pairs can be added with + config add and keys can be removed with + config remove. The initial value may be an + empty map, but it has to be set before zones are added or + removed. > config set data_sources/classes/IN[1]/params {} From f4dcd7d3757902c90bfa3e7b7db1600c624ea510 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Mon, 22 Jul 2013 17:56:07 +0530 Subject: [PATCH 03/10] [3020] Add config commit --- doc/guide/bind10-guide.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index b7eb5025ff..a6a63737e7 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2619,7 +2619,7 @@ can use various data source backends. > config add data_sources/classes/IN[1]/params another.example.org /path/to/another.example.org > config add data_sources/classes/IN[1]/params another.example.com /path/to/another.example.com > config remove data_sources/classes/IN[1]/params another.example.org - +> config commit From 770c05222d92752594605e1fd16e9527e1d079cb Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Mon, 22 Jul 2013 18:23:00 +0530 Subject: [PATCH 04/10] [3020] Describe in the BIND 10 guide how to add and use a static data source --- doc/guide/bind10-guide.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index a6a63737e7..c3773635cd 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2639,6 +2639,38 @@ can use various data source backends. +
+ Adding a static data source + + Assuming there is no existing static data source, here is how + you can add one, to serve the zones in + static.zone distributed with BIND 10. + + + First, add the CH class if it doesn't exist: + + > config add data_sources/classes CH +> config commit + + Then, add a data source of type MasterFiles + in the CH class to serve the zones in + static.zone: + + > config add data_sources/classes/CH +> config set data_sources/classes/CH[0]/type MasterFiles +> config set data_sources/classes/CH[0]/cache-enable true +> config set data_sources/classes/CH[0]/params {"BIND": "/usr/local/bind10/share/bind10/static.zone"} +> config commit + + Then, lookup the static data from static.zone to test it: + + > dig @localhost -c CH -t TXT version.bind +> dig @localhost -c CH -t TXT authors.bind + + + +
+
From 7915732b2210e5540a74041eb759b13af0f6c405 Mon Sep 17 00:00:00 2001 From: "Jeremy C. Reed" Date: Tue, 23 Jul 2013 17:27:59 -0500 Subject: [PATCH 05/10] [3020] typo fix --- doc/guide/bind10-guide.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index c3773635cd..427386211d 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2602,7 +2602,7 @@ can use various data source backends. > config commit Unfortunately, due to current technical limitations, the - params must be set as one JSON blob. To reload a zone, you the + params must be set as one JSON blob. To reload a zone, use the same Auth loadzone command as above. From e21cb1dba24a85e7afea480562d2b7277050e0dc Mon Sep 17 00:00:00 2001 From: "Jeremy C. Reed" Date: Wed, 24 Jul 2013 15:45:34 +0530 Subject: [PATCH 06/10] [3020] Add a description for the static zone --- doc/guide/bind10-guide.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index 427386211d..0d255218bf 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2641,6 +2641,13 @@ can use various data source backends.
Adding a static data source + + + BIND 10 provides a zone file for the CH (Chaos) class for + providing information about the server via the AUTHORS.BIND + and VERSION.BIND TXT records. + + Assuming there is no existing static data source, here is how you can add one, to serve the zones in From 5c56a768045e78576cc71346a5cf4de9f2a35a13 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 24 Jul 2013 15:49:47 +0530 Subject: [PATCH 07/10] [3020] Add text about re-enabling the static.zone file --- doc/guide/bind10-guide.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index 0d255218bf..fe3bf0ee6f 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2643,15 +2643,18 @@ can use various data source backends. Adding a static data source - BIND 10 provides a zone file for the CH (Chaos) class for + BIND 10 includes a zone file named + static.zone in the CH (Chaos) class for providing information about the server via the AUTHORS.BIND - and VERSION.BIND TXT records. + and VERSION.BIND TXT records. By default, this BIND zone is + configured and its records are served. - Assuming there is no existing static data source, here is how - you can add one, to serve the zones in - static.zone distributed with BIND 10. + If you have removed this zone from the configuration (e.g., by + using the commands in the previous section to disable the + "built-in data source"), here is how you can add it back to + serve the zones in the static.zone file. First, add the CH class if it doesn't exist: From 456a43775ebd7982ba98f57286702c420f983cf5 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 24 Jul 2013 15:51:41 +0530 Subject: [PATCH 08/10] [3020] Update text that we assume the resolver is running on localhost --- doc/guide/bind10-guide.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index fe3bf0ee6f..bb6f22bccd 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2672,7 +2672,9 @@ can use various data source backends. > config set data_sources/classes/CH[0]/params {"BIND": "/usr/local/bind10/share/bind10/static.zone"} > config commit - Then, lookup the static data from static.zone to test it: + Then, lookup the static data from + static.zone to test it (assuming your + resolver is running on localhost): > dig @localhost -c CH -t TXT version.bind > dig @localhost -c CH -t TXT authors.bind From 39a853b0f561e12604fcb31a2b3746d5d577071a Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 24 Jul 2013 16:00:13 +0530 Subject: [PATCH 09/10] [3020] Fix comments at the start of static.zone file --- src/lib/datasrc/static.zone.pre | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/datasrc/static.zone.pre b/src/lib/datasrc/static.zone.pre index 13c0c9dbbb..8046410393 100644 --- a/src/lib/datasrc/static.zone.pre +++ b/src/lib/datasrc/static.zone.pre @@ -1,10 +1,10 @@ -;; This is the content of the BIND./CH zone. It contains the version and -;; authors (called VERSION.BIND. and AUTHORS.BIND.). You can add more or -;; modify the zone. Then you can reload the zone by issuing the command +;; This file contains records for the BIND./CH zone. It contains version +;; (VERSION.BIND.) and authors (AUTHORS.BIND.) information. You can add +;; more records or modify this zone file like any other zone file. If +;; you modify this file, you can reload the zone by issuing the +;; following command in the bindctl program: ;; -;; loadzone CH BIND -;; -;; in the bindctl. +;; Auth loadzone CH BIND ;; This is here mostly for technical reasons. BIND. 0 CH SOA bind. authors.bind. 0 28800 7200 604800 86400 From 979f2981bc3518e349e036f92f5058aac2b1faf8 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 24 Jul 2013 16:03:58 +0530 Subject: [PATCH 10/10] [3020] Update instructions to test the auth server directly --- doc/guide/bind10-guide.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml index bb6f22bccd..84aff99696 100644 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@ -2674,7 +2674,7 @@ can use various data source backends. Then, lookup the static data from static.zone to test it (assuming your - resolver is running on localhost): + authoritative server is running on localhost): > dig @localhost -c CH -t TXT version.bind > dig @localhost -c CH -t TXT authors.bind