diff --git a/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan index 304d415a9b..dbc9266a10 100644 --- a/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan +++ b/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan @@ -7,10 +7,11 @@ declaration template metaconfig/named/schema; include 'pan/types'; -type named_acl_name = string with - exists ("/software/components/metaconfig/services/{/etc/named.conf}/contents/acls/" + SELF) || - match (SELF, "^(none|localhost|any|localnets)$") || - error ("ACL with name " + SELF + " is not defined"); +type named_acl_name = string with { + exists("/software/components/metaconfig/services/{/etc/named.conf}/contents/acls/" + SELF) || + match(SELF, "^(none|localhost|any|localnets)$") || + error("ACL with name " + SELF + " is not defined"); +}; type named_source = { "ip" ? type_ip @@ -95,9 +96,10 @@ type named_zone = { true; }; -type named_channel_name = string with +type named_channel_name = string with { exists ("/software/components/metaconfig/services/{/etc/named.conf}/contents/logging/" + SELF) || error (SELF + " doesn't refer to a logging channel"); +}; @{ Named log parameters diff --git a/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan b/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan index b43b7ec0d6..3259987b28 100644 --- a/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan +++ b/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan @@ -6,7 +6,8 @@ prefix "/software/components/metaconfig/services/{/etc/named.conf}/contents"; "logging/channels/default_debug" = dict ( "severity", "dynamic", - "file", "data/named.run"); + "file", "data/named.run", +); "logging/category" = dict(); "includes" = append("/etc/named.rfc1912.zones"); "includes" = append("/etc/another.conf");