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

[master]Merge remote-tracking branch 'origin/trac2361'

parents 3404981c 77e32834
......@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES([Makefile
src/bin/bindctl/Makefile
src/bin/bindctl/tests/Makefile
src/bin/cfgmgr/Makefile
src/bin/cfgmgr/local_plugins/Makefile
src/bin/cfgmgr/plugins/Makefile
src/bin/cfgmgr/plugins/tests/Makefile
src/bin/cfgmgr/tests/Makefile
......
SUBDIRS = . plugins tests
SUBDIRS = . plugins local_plugins tests
pkglibexecdir = $(libexecdir)/@PACKAGE@
......
# Nothing is installed from this directory. This local_plugins
# directory overrides the plugins directory when lettuce is run, and the
# spec file here is used to serve the static zone from the 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
EXTRA_DIST = README logging.spec tsig_keys.spec
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_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec
......
......@@ -12,7 +12,7 @@
{
"type": "sqlite3",
"params": {
"database_file": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
"database_file": "@@SQLITE3_DATABASE_FILE@@"
}
}
],
......@@ -20,7 +20,7 @@
{
"type": "static",
"cache-enable": false,
"params": "@@PKGDATADIR@@/static.zone"
"params": "@@STATIC_ZONE_FILE@@"
}
]
},
......
......@@ -51,7 +51,7 @@ def reload():
# tree the programs in the tree (not installed ones) will be used.
#
# B10_FROM_SOURCE_LOCALSTATEDIR is specifically intended to be used for
# tests where we want to use variuos types of configuration within the test
# tests where we want to use various types of configuration within the test
# environment. (We may want to make it even more generic so that the path
# is passed from the boss process)
if "B10_FROM_SOURCE" in os.environ:
......@@ -60,6 +60,8 @@ def reload():
else:
DATA_PATH = 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']
programdirs = ['auth', 'cfgmgr', 'cmdctl', 'ddns', 'dhcp6', 'msgq',
'resolver', 'sockcreator', 'stats', 'xfrin', 'xfrout',
......
{
"version": 2,
"Logging": {
"loggers": [ {
"debuglevel": 99,
"severity": "DEBUG",
"name": "*"
} ]
},
"Auth": {
"listen_on": [ {
"port": 47806,
"address": "127.0.0.1"
} ]
},
"Boss": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
"b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
}
}
}
Feature: Basic Authoritative DNS server
This feature set is for testing the execution of the b10-auth
component using its default datasource configurations. This
will start it and perform queries against it.
Scenario: Query builtin bind zone
Given I have bind10 running with configuration auth/auth_basic.config
And wait for bind10 stderr message BIND10_STARTED_CC
And wait for bind10 stderr message CMDCTL_STARTED
And wait for bind10 stderr message AUTH_SERVER_STARTED
bind10 module Auth should be running
And bind10 module Resolver should not be running
A query for example.com should have rcode REFUSED
A query for version.bind type TXT class CH should have rcode NOERROR
A query for authors.bind type TXT class CH should have rcode NOERROR
# TODO: to be compatible with BIND 9
# A query for nonexistent.bind type TXT class CH should have rcode REFUSED
......@@ -49,6 +49,8 @@ copylist = [
"configurations/example.org.config"],
["configurations/bindctl/bindctl.config.orig",
"configurations/bindctl/bindctl.config"],
["configurations/auth/auth_basic.config.orig",
"configurations/auth/auth_basic.config"],
["configurations/resolver/resolver_basic.config.orig",
"configurations/resolver/resolver_basic.config"],
["configurations/multi_instance/multi_auth.config.orig",
......
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