From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Wed, 4 Jul 2012 09:08:46 +0000 (+0200)
Subject: [1976] Provide default configuration for static data source
X-Git-Tag: trac2351_base~97^2~7^2~2^2~21^2~2^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eabb375e7dfc94f67aab7e4d8e372d71db9885c1;p=thirdparty%2Fkea.git

[1976] Provide default configuration for static data source

So users don't have to set it up, but they can disable it if they want.
---

diff --git a/configure.ac b/configure.ac
index 70df25d7e8..cc68f4b085 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1137,6 +1137,7 @@ AC_CONFIG_FILES([Makefile
 AC_OUTPUT([doc/version.ent
            src/bin/cfgmgr/b10-cfgmgr.py
            src/bin/cfgmgr/tests/b10-cfgmgr_test.py
+           src/bin/cfgmgr/plugins/datasrc.spec.pre
            src/bin/cmdctl/cmdctl.py
            src/bin/cmdctl/run_b10-cmdctl.sh
            src/bin/cmdctl/tests/cmdctl_test
diff --git a/src/bin/cfgmgr/plugins/Makefile.am b/src/bin/cfgmgr/plugins/Makefile.am
index a6a33621c1..44311272ce 100644
--- a/src/bin/cfgmgr/plugins/Makefile.am
+++ b/src/bin/cfgmgr/plugins/Makefile.am
@@ -1,6 +1,9 @@
 SUBDIRS = tests
 
-EXTRA_DIST = README logging.spec tsig_keys.spec datasrc.spec
+EXTRA_DIST = README logging.spec tsig_keys.spec
+
+datasrc.spec: datasrc.spec.pre
+	$(SED) -e "s|@@PKGDATADIR@@|$(pkgdatadir)|" 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 b/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
similarity index 87%
rename from src/bin/cfgmgr/plugins/datasrc.spec
rename to src/bin/cfgmgr/plugins/datasrc.spec.pre.in
index fb06792af4..5bd20bb559 100644
--- a/src/bin/cfgmgr/plugins/datasrc.spec
+++ b/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
@@ -7,7 +7,15 @@
                 "item_name": "classes",
                 "item_type": "named_set",
                 "item_optional": false,
-                "item_default": {},
+                "item_default": {
+                    "CH": [
+                        {
+                            "type": "static",
+                            "cache-enable": false,
+                            "params": "@@PKGDATADIR@@/static.zone"
+                        }
+                    ]
+                },
                 "named_set_item_spec": {
                     "item_name": "class",
                     "item_type": "list",