named.conf is not a concat, make one for keys

This commit is contained in:
Nate Riffe 2012-09-04 23:53:04 -05:00
parent 4e74ffe8a9
commit a62f9dd107
3 changed files with 9 additions and 1 deletions

View File

@ -45,6 +45,7 @@ class bind (
concat { [ concat { [
"${confdir}/acls.conf", "${confdir}/acls.conf",
"${confdir}/keys.conf",
"${confdir}/views.conf", "${confdir}/views.conf",
]: ]:
owner => 'root', owner => 'root',
@ -59,6 +60,12 @@ class bind (
content => "# This file is managed by puppet - changes will be lost\n", content => "# This file is managed by puppet - changes will be lost\n",
} }
concat::fragment { "named-keys-header":
order => '00',
target => "${confdir}/keys.conf",
content => "# This file is managed by puppet - changes will be lost\n",
}
concat::fragment { "named-views-header": concat::fragment { "named-views-header":
order => '00', order => '00',
target => "${confdir}/views.conf", target => "${confdir}/views.conf",

View File

@ -12,7 +12,7 @@ define bind::key (
} }
concat::fragment { "bind-key-${name}": concat::fragment { "bind-key-${name}":
order => '10', order => '10',
target => "${bind::confdir}/named.conf", target => "${bind::confdir}/keys.conf",
content => "include \"${bind::confdir}/keys/${name}.conf\";\n", content => "include \"${bind::confdir}/keys/${name}.conf\";\n",
} }
} }

View File

@ -1,5 +1,6 @@
# This file is managed by puppet - changes will be lost # This file is managed by puppet - changes will be lost
include "<%= confdir %>/acls.conf"; include "<%= confdir %>/acls.conf";
include "<%= confdir %>/keys.conf";
include "<%= confdir %>/views.conf"; include "<%= confdir %>/views.conf";
options { options {