BIND 10 trac2133, updated. 8145395b1a6680f3efc7baa0a05663c07b670dc1 [2133] Don't use defaults in lettuce

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Aug 1 13:05:52 UTC 2012


The branch, trac2133 has been updated
       via  8145395b1a6680f3efc7baa0a05663c07b670dc1 (commit)
       via  8a9addc70d264708dc92a328d5ccf02465fcbb15 (commit)
      from  0050740b21f115c54527b6942d98136988833ced (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8145395b1a6680f3efc7baa0a05663c07b670dc1
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 1 14:36:01 2012 +0200

    [2133] Don't use defaults in lettuce
    
    Because the defaults include references to files in install directory
    and lettuce breaks when the files are not yet installed. This should fix
    bug #2159 as well.

commit 8a9addc70d264708dc92a328d5ccf02465fcbb15
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 1 14:32:16 2012 +0200

    [2133] Provide reasonable default for data_sources
    
    Include the default sqlite3 database as well. This is easier than
    documenting everything and it would just work.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/cfgmgr/plugins/Makefile.am                 |    2 +-
 src/bin/cfgmgr/plugins/datasrc.spec.pre.in         |    8 ++++++++
 .../configurations/bindctl/bindctl.config.orig     |    3 +++
 .../configurations/bindctl_commands.config.orig    |    3 +++
 4 files changed, 15 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cfgmgr/plugins/Makefile.am b/src/bin/cfgmgr/plugins/Makefile.am
index eb7809c..e6ed127 100644
--- a/src/bin/cfgmgr/plugins/Makefile.am
+++ b/src/bin/cfgmgr/plugins/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = tests
 EXTRA_DIST = README logging.spec tsig_keys.spec
 
 datasrc.spec: datasrc.spec.pre
-	$(SED) -e "s|@@PKGDATADIR@@|$(pkgdatadir)|" datasrc.spec.pre >$@
+	$(SED) -e "s|@@PKGDATADIR@@|$(pkgdatadir)|;s|@@LOCALSTATEDIR@@|$(localstatedir)|" datasrc.spec.pre >$@
 
 config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
 config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec
diff --git a/src/bin/cfgmgr/plugins/datasrc.spec.pre.in b/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
index 5bd20bb..f2c6a97 100644
--- a/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
+++ b/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
@@ -8,6 +8,14 @@
                 "item_type": "named_set",
                 "item_optional": false,
                 "item_default": {
+                    "IN": [
+                        {
+                            "type": "sqlite3",
+                            "params": {
+                                "database_file": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
+                            }
+                        }
+                    ],
                     "CH": [
                         {
                             "type": "static",
diff --git a/tests/lettuce/configurations/bindctl/bindctl.config.orig b/tests/lettuce/configurations/bindctl/bindctl.config.orig
index bf623c5..3530b3e 100644
--- a/tests/lettuce/configurations/bindctl/bindctl.config.orig
+++ b/tests/lettuce/configurations/bindctl/bindctl.config.orig
@@ -14,6 +14,9 @@
             "address": "127.0.0.1"
         } ]
     },
+    "data_sources": {
+        "classes": {}
+    },
     "Boss": {
         "components": {
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
diff --git a/tests/lettuce/configurations/bindctl_commands.config.orig b/tests/lettuce/configurations/bindctl_commands.config.orig
index d74b96e..b60201d 100644
--- a/tests/lettuce/configurations/bindctl_commands.config.orig
+++ b/tests/lettuce/configurations/bindctl_commands.config.orig
@@ -14,6 +14,9 @@
             "address": "127.0.0.1"
         } ]
     },
+    "data_sources": {
+        "classes": {}
+    },
     "StatsHttpd": {
         "listen_on": [ {
             "port": 47811,



More information about the bind10-changes mailing list