-
Notifications
You must be signed in to change notification settings - Fork 70
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
Added defaultzonepath to template name.conf.erb #217
Conversation
Added defaultzonepath to named.conf.erb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is correct. Prior to this it was only used when views were enabled (
puppet-dns/templates/named.view_header.erb
Lines 50 to 54 in 47fb22b
| <% if @include_defaultzones -%> | |
| <% if scope.lookupvar("::dns::defaultzonepath") != 'unmanaged' -%> | |
| include "<%= scope.lookupvar('::dns::defaultzonepath') %>"; | |
| <% end -%> | |
| <% end -%> |
I started the test suite.
|
Could you address the test failures? |
|
@ekohl Tests should be passing now if you want to kick them off again in this repo. Thanks Ben |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
| @@ -140,9 +147,11 @@ | |||
| " include \"#{options_path}\";", | |||
| '};', | |||
| "include \"#{localzonepath}\";", | |||
| defaultzonepath ? "include \"#{defaultzonepath}\";" : nil, | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like this solution more than what was used for localzonepath.
Fixes issue #216
Closes #216