Skip to content

Additional configuration parameters #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bashioo wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Additional configuration parameters #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9fd594
Added response-policy block to view
bashioo Jun 29, 2018
650ab4d
Added listen-on to named.conf
bashioo Jun 29, 2018
02109e4
Added query-source to named.conf
bashioo Jun 29, 2018
c71f332
Added allow-query to zone config
bashioo Jun 29, 2018
3847047
Added server-addresses for static-stub zone configuration
bashioo Jun 29, 2018
9eb6287
Changed default_zones_include to allow multiple default zones
bashioo Jun 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,33 @@ bind::view { 'ns':
}
```

View declaration can include `response-policy` clause configuration. Each zone included in `response-policy` can have
specific options set or global options from view will be used:

```
bind::view { 'internet':
...
'response_policy' => {
'zones' => {
'dontlike' => {
'policy' => 'drop',
'recursive-only' => true,
'max-policy-ttl' => 3600,
'log' => false,
},
...
},
'recursive-only' => true,
'max-policy-ttl' => 6000,
'break-dnssec' => false,
'min-ns-dots' => 5,
'qname-wait-recurse' => true,
'nsip-wait-recurse' => frue,
}
...
}
```

## Resources

### `resource_record`
Expand Down
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
$tkey_gssapi_credential = undef,
$tkey_domain = undef,
$chroot = false,
$listen_on = undef,
$query_source = undef,
$chroot_class = $::bind::defaults::chroot_class,
$chroot_dir = $::bind::defaults::chroot_dir,
# NOTE: we need to be able to override this parameter when declaring class,
Expand Down
1 change: 1 addition & 0 deletions manifests/view.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
$empty_zones = '',
$order = '10',
$minimal_responses = false,
$response_policy = {},
) {
$confdir = $::bind::confdir
$default_zones_include = $::bind::default_zones_include
Expand Down
42 changes: 24 additions & 18 deletions manifests/zone.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,26 @@

define bind::zone (
$zone_type,
$domain = '',
$dynamic = true,
$masters = '',
$transfer_source = '',
$notify_source = '',
$allow_updates = '',
$update_policies = '',
$allow_transfers = '',
$dnssec = false,
$nsec3_salt = '',
$key_directory = '',
$ns_notify = true,
$also_notify = '',
$allow_notify = '',
$forwarders = '',
$forward = '',
$source = '',
$forwarders_port = 53,
$domain = '',
$dynamic = true,
$masters = '',
$transfer_source = '',
$notify_source = '',
$allow_updates = '',
$update_policies = '',
$allow_transfers = '',
$dnssec = false,
$nsec3_salt = '',
$key_directory = '',
$ns_notify = true,
$also_notify = '',
$allow_notify = '',
$forwarders = '',
$forward = '',
$source = '',
$forwarders_port = 53,
$allow_query = '',
$server_addresses = '',
) {
# where there is a zone, there is a server
include ::bind
Expand Down Expand Up @@ -81,6 +83,10 @@
fail("source may only be provided for bind::zone resources with zone_type 'master' or 'hint'")
}

unless !($server_addresses != '' and $zone_type != 'static-stub') {
fail("server_addresses may only be provided for bind::zone resources with zone_type 'static-stub'")
}

$zone_file_mode = $zone_type ? {
'master' => $dynamic ? {
true => 'init',
Expand Down
10 changes: 10 additions & 0 deletions templates/named.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ options {
<%- if @tkey_domain -%>
tkey-domain "<%= @tkey_domain %>";
<%- end -%>
<%- if @listen_on and @listen_on != '' -%>
listen-on {
<%- Array(@listen_on).each do |listen_on_address| -%>
<%= listen_on_address %>;
<%- end -%>
};
<%- end -%>
<%- if @query_source and @query_source != '' -%>
query-source address <%= @query_source %>;
<%- end -%>
};
<%- if @include_local -%>

Expand Down
43 changes: 42 additions & 1 deletion templates/view.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,48 @@ view "<%= @name %>" {
notify-source <%= @notify_source %>;
<%- end -%>
<%- if @include_default_zones and @default_zones_include -%>
include "<%= @default_zones_include %>";
<%- Array(@default_zones_include).each do |zone| -%>
include "<%= zone %>";
<%- end -%>
<%- end -%>
<%- if @response_policy.has_key?('zones') -%>
response-policy {
<%- @response_policy['zones'].each do |rpz_zone_name,rpz_zone| -%>
zone <%= "\"#{rpz_zone_name}\"" -%>
<%- if @rpz_zone -%>
<%- if rpz_zone.has_key?('policy') and rpz_zone['policy'] != '' -%>
<%= "\n" %> policy <%= rpz_zone['policy'] -%>
<%- end -%>
<%- if rpz_zone.has_key?('recursive_only') and rpz_zone['recursive_only'] != '' -%>
<%= "\n" %> recursive-only <%= rpz_zone['recursive_only'] ? 'yes' : 'no' -%>
<%- end -%>
<%- if rpz_zone.has_key?('max_policy_ttl') and rpz_zone['max_policy_ttl'] != '' -%>
<%= "\n" %> max-policy-ttl <%= rpz_zone['max_policy_ttl'] -%>
<%- end -%>
<%- if rpz_zone.has_key?('log') and rpz_zone['log'] != '' -%>
<%= "\n" %> log <%= rpz_zone['log'] ? 'yes' : 'no' -%>
<%- end -%>
<%- end -%>;
<%- end -%>
}
<%- if @response_policy.has_key?('recursive_only') and @response_policy['recursive_only'] != '' -%>
recursive-only <%= @response_policy['recursive_only'] ? 'yes' : 'no' -%>
<%- end -%>
<%- if @response_policy.has_key?('max_policy_ttl') and @response_policy['max_policy_ttl'] != '' -%>
<%= "\n" %> max-policy-ttl <%= @response_policy['max_policy_ttl'] -%>
<%- end -%>
<%- if @response_policy.has_key?('break_dnssec') and @response_policy['break_dnssec'] != '' -%>
<%= "\n" %> break-dnssec <%= @response_policy['break_dnssec'] ? 'yes' : 'no' -%>
<%- end -%>
<%- if @response_policy.has_key?('min_ns_dots') and @response_policy['min_ns_dots'] != '' -%>
<%= "\n" %> min-ns-dots <%= @response_policy['min_ns_dots'] -%>
<%- end -%>
<%- if @response_policy.has_key?('qname_wait_recurse') and @response_policy['qname_wait_recurse'] != '' -%>
<%= "\n" %> qname-wait-recurse <%= @response_policy['qname_wait_recurse'] ? 'yes' : 'no' -%>
<%- end -%>
<%- if @response_policy.has_key?('nsip_wait_recurse') and @response_policy['nsip_wait_recurse'] != '' -%>
<%= "\n" %> nsip-wait-recurse <%= @response_policy['nsip_wait_recurse'] ? 'yes' : 'no' -%>
<%- end -%>;
<%- end -%>

<%- Array(@zones).each do |zone| -%>
Expand Down
14 changes: 14 additions & 0 deletions templates/zone.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,18 @@ zone "<%= @_domain %>" {
<%- end -%>
};
<%- end -%>
<%- if @allow_query and @allow_query != '' -%>
allow-query {
<%- Array(@allow_query).each do |query_client| -%>
<%= query_client %>;
<%- end -%>
};
<%- end -%>
<%- if @zone_type == 'static-stub' and @server_addresses != '' -%>
server-addresses {
<%- Array(@server_addresses).each do |server| -%>
<%= server %>;
<%- end -%>
};
<%- end -%>
};