unkinben/puppet-bind
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ocado/notify-source' into 6.0-prerelease

Browse Source
This commit is contained in:
Nate Riffe 2016-04-20 08:02:26 -05:00
commit d50406d0df
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/view.pp
View File

@ -9,6 +9,8 @@ define bind::view (
$recursion_match_clients = 'any', $recursion_match_clients = 'any',
$recursion_match_destinations = '', $recursion_match_destinations = '',
$recursion_match_only = false, $recursion_match_only = false,
$notify_source = '',
$also_notify = [],
$order = '10', $order = '10',
) { ) {
$confdir = $::bind::confdir $confdir = $::bind::confdir

5
manifests/zone.pp
View File

@ -6,6 +6,7 @@ define bind::zone (
$dynamic = true, $dynamic = true,
$masters = '', $masters = '',
$transfer_source = '', $transfer_source = '',
$notify_source = '',
$allow_updates = '', $allow_updates = '',
$update_policies = '', $update_policies = '',
$allow_transfers = '', $allow_transfers = '',
@ -49,6 +50,10 @@ define bind::zone (
fail("transfer_source may only be provided for bind::zone resources with zone_type 'slave' or 'stub'") fail("transfer_source may only be provided for bind::zone resources with zone_type 'slave' or 'stub'")
} }
unless !($notify_source != '' and ! member(['master', 'slave'], $zone_type)) {
fail("notify_source may only be provided for bind::zone resources with zone_type 'master' or 'slave'")
}
unless !($allow_updates != '' and ! $dynamic) { unless !($allow_updates != '' and ! $dynamic) {
fail("allow_updates may only be provided for bind::zone resources with dynamic set to true") fail("allow_updates may only be provided for bind::zone resources with dynamic set to true")
} }

9
templates/view.erb
View File

@ -43,6 +43,15 @@ view "<%= @name %>" {
<%- end -%> <%- end -%>
}; };
<%- end -%> <%- end -%>
<%- if @also_notify and @also_notify != '' -%>
also-notify {
<%- Array(@also_notify).each do |server| -%>
<%= server %>;
<%- end -%>
};
<%- end -%>
<%- if @notify_source and @notify_source != '' -%>
notify-source <%= @notify_source %>;
<%- end -%> <%- end -%>
<%- if @include_default_zones and @default_zones_include -%> <%- if @include_default_zones and @default_zones_include -%>
include "<%= @default_zones_include %>"; include "<%= @default_zones_include %>";

3
templates/zone.conf.erb
View File

@ -40,6 +40,9 @@ zone "<%= @_domain %>" {
<%- if @transfer_source and @transfer_source != ''-%> <%- if @transfer_source and @transfer_source != ''-%>
transfer-source <%= @transfer_source %>; transfer-source <%= @transfer_source %>;
<%- end -%> <%- end -%>
<%- if @notify_source and @notify_source != ''-%>
notify-source <%= @notify_source %>;
<%- end -%>
<%- if @allow_updates and @allow_updates != '' -%> <%- if @allow_updates and @allow_updates != '' -%>
allow-update { allow-update {
<%- Array(@allow_updates).each do |allow_update| -%> <%- Array(@allow_updates).each do |allow_update| -%>