-
Notifications
You must be signed in to change notification settings - Fork 71
enable rpz zone support #284
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.
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
Merged
+64
−44
Merged
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
32404fe
add functional support for enabling rpz zones
7aa3d6f
change options.conf.erb to epp and enable rpz zone support
78fd3c6
remove obsolete options.conf.erb template
bfba615
default rpz_zones to undefined aligning to best practice
73c03a8
improve template parameter validation logic
eeba354
correct undefined array value for rpz_zones
cc47656
fix incorrect condition on dnssec_enabled
e2b80c1
fix incorrect parameter condition
7d47940
validate rpz_zones againt stdlib::fqdn
f73e1e2
add test for rpz zone config validation
abd2e3f
improve check on dns::forwarders logic
c214837
correct rpz_zones to array
b42d17d
correct typo validating dns::forwarders
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| directory "<%= $dns::vardir %>"; | ||
| <% if $dns::forwarders and $dns::forwarders != [] { -%> | ||
ikonia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| forwarders { <%= join($dns::forwarders, '; ') %>; }; | ||
| <% } -%> | ||
| <% if $dns::forward != undef and $dns::forward != '' { -%> | ||
ikonia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| forward <%= $dns::forward %>; | ||
| <% } -%> | ||
|
|
||
| <% unless empty($dns::rpz_zones) { -%> | ||
| response-policy { | ||
| <% $dns::rpz_zones.each |$zone| { -%> | ||
| zone "<%= $zone %>"; | ||
| <% } -%> | ||
| }; | ||
| <% } -%> | ||
|
|
||
| recursion <%= $dns::recursion %>; | ||
| allow-query { <%= join($dns::allow_query, '; ') %>; }; | ||
| <% if $dns::dnssec_enable != undef and $dns::dnssec_enable != '' and $dns::dnssec_enable != false { -%> | ||
ikonia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| dnssec-enable <%= $dns::dnssec_enable %>; | ||
| <% } -%> | ||
| dnssec-validation <%= $dns::dnssec_validation %>; | ||
|
|
||
| empty-zones-enable <%= $dns::empty_zones_enable %>; | ||
|
|
||
| <% if $dns::dns_notify { -%> | ||
| notify <%= $dns::dns_notify %>; | ||
| <% } -%> | ||
| <% if $dns::listen_on { -%> | ||
| listen-on { <%= $dns::listen_on %>; }; | ||
| <% } -%> | ||
| <% if $dns::listen_on_v6 { -%> | ||
| listen-on-v6 { <%= $dns::listen_on_v6 %>; }; | ||
| <% } -%> | ||
|
|
||
| <% if $dns::allow_recursion { -%> | ||
| allow-recursion { <%= join($dns::allow_recursion, '; ') %>; }; | ||
| <% } -%> | ||
|
|
||
| <% if $facts['os']['family'] =~ /^(FreeBSD|DragonFly)$/ { -%> | ||
| pid-file "/var/run/named/pid"; | ||
| <% } -%> | ||
|
|
||
| <% $dns::disable_empty_zones.sort.each |$disable_empty_zone| { -%> | ||
| disable-empty-zone "<%= $disable_empty_zone %>"; | ||
| <% } -%> | ||
|
|
||
| <% $dns::additional_options.keys.sort.each |$option| { -%> | ||
| <% $value = $dns::additional_options[$option] -%> | ||
| <%= $option %> <%= $value %>; | ||
| <% } -%> | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.