Commit 7161d9d8 authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

[trac2361] fix issue where the bind10 could not run in source tree

when the installation was not done yet.

I added extra local_plugins path and custom datasrc.spec plugin for that.
parent 3ac353a5
...@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES([Makefile ...@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES([Makefile
src/bin/bindctl/Makefile src/bin/bindctl/Makefile
src/bin/bindctl/tests/Makefile src/bin/bindctl/tests/Makefile
src/bin/cfgmgr/Makefile src/bin/cfgmgr/Makefile
src/bin/cfgmgr/local_plugins/Makefile
src/bin/cfgmgr/plugins/Makefile src/bin/cfgmgr/plugins/Makefile
src/bin/cfgmgr/plugins/tests/Makefile src/bin/cfgmgr/plugins/tests/Makefile
src/bin/cfgmgr/tests/Makefile src/bin/cfgmgr/tests/Makefile
......
SUBDIRS = . plugins tests SUBDIRS = . plugins local_plugins tests
pkglibexecdir = $(libexecdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@
......
# Nothing is installed from this directory.
# This local_plugins directory is to override plugins when used from running
# within source tree for testing (instead of installation prefix).
noinst_DATA = datasrc.spec
datasrc.spec: ../plugins/datasrc.spec.pre
$(SED) -e "s|@@STATIC_ZONE_FILE@@|$(abs_top_builddir)/src/lib/datasrc/static.zone|;s|@@SQLITE3_DATABASE_FILE@@|$(abs_top_builddir)/local.zone.sqlite3|" ../plugins/datasrc.spec.pre >$@
CLEANFILES = datasrc.spec
...@@ -3,7 +3,7 @@ SUBDIRS = tests ...@@ -3,7 +3,7 @@ SUBDIRS = tests
EXTRA_DIST = README logging.spec tsig_keys.spec EXTRA_DIST = README logging.spec tsig_keys.spec
datasrc.spec: datasrc.spec.pre datasrc.spec: datasrc.spec.pre
$(SED) -e "s|@@PKGDATADIR@@|$(pkgdatadir)|;s|@@LOCALSTATEDIR@@|$(localstatedir)|" datasrc.spec.pre >$@ $(SED) -e "s|@@STATIC_ZONE_FILE@@|$(pkgdatadir)/static.zone|;s|@@SQLITE3_DATABASE_FILE@@|$(localstatedir)/$(PACKAGE)/zone.sqlite3|" datasrc.spec.pre >$@
config_plugindir = @prefix@/share/@PACKAGE@/config_plugins config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{ {
"type": "sqlite3", "type": "sqlite3",
"params": { "params": {
"database_file": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3" "database_file": "@@SQLITE3_DATABASE_FILE@@"
} }
} }
], ],
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
{ {
"type": "static", "type": "static",
"cache-enable": false, "cache-enable": false,
"params": "@@PKGDATADIR@@/static.zone" "params": "@@STATIC_ZONE_FILE@@"
} }
] ]
}, },
......
...@@ -60,6 +60,8 @@ def reload(): ...@@ -60,6 +60,8 @@ def reload():
else: else:
DATA_PATH = os.environ["B10_FROM_SOURCE"] DATA_PATH = os.environ["B10_FROM_SOURCE"]
PLUGIN_PATHS = [os.environ["B10_FROM_SOURCE"] + PLUGIN_PATHS = [os.environ["B10_FROM_SOURCE"] +
'/src/bin/cfgmgr/local_plugins',
os.environ["B10_FROM_SOURCE"] +
'/src/bin/cfgmgr/plugins'] '/src/bin/cfgmgr/plugins']
programdirs = ['auth', 'cfgmgr', 'cmdctl', 'ddns', 'dhcp6', 'msgq', programdirs = ['auth', 'cfgmgr', 'cmdctl', 'ddns', 'dhcp6', 'msgq',
'resolver', 'sockcreator', 'stats', 'xfrin', 'xfrout', 'resolver', 'sockcreator', 'stats', 'xfrin', 'xfrout',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment