-
Notifications
You must be signed in to change notification settings - Fork 112
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 support to modify service startup #130
Conversation
I needed support for accessing the startup hocks, so I put this in. Now you are able to define to resolve the configuration or to start bind in ipv4 / ivp6 mode. I made sure that the module will not overwrite any other file.
Conflicts: manifests/server/params.pp
Fix rspec files with missing comcat_basedir definition.
@@ -0,0 +1,90 @@ | |||
# == Define: dns::server::startup |
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 we are ready to need this. I don't really like the name "startup" though, it makes me think it handles init script.
How about class: dns::server::defaults_file ?
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.
How about class dns::server::defaults? The definition of defaults_file will be used in the code to set the filename.
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.
That sounds fine
Now it is renamed and corrected. Do you fix the merge conflict? |
It is usually up to the pull requested to fix merge conflicts and bring the PR into a mergable form. |
Conflicts: manifests/server/params.pp spec/classes/dns__server__config_spec.rb
The merge conflicts are solved :-) |
@@ -6,4 +6,5 @@ | |||
# include dns::install | |||
# include dns::config | |||
# include dns::service | |||
include dns::server::default |
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.
Shouldn't this be in dns::server::install? Seems out of place here
Ok is fixed and was moved to "manifest/server/install.pp". |
|
||
) inherits dns::server::params { | ||
|
||
if ! defined(Class['::dns::server']) { |
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.
This is incorrect now, this class should be safe to include no matter what
Good. We have an acceptance test suite using beaker that is now failing. We don't run these on Travis as they are too intensive. You can run these tests with I ran them here and here are the failures: |
I'll try it. Apparently I do not get it to work "out of the box". |
Now, after several more days, the problem could be solved. All tests were carried out and I get no error. |
Good. Can you pastebin the output? |
Sure: bundle exec rake spec bundle exec rake beaker |
Thank you! |
Added support to modify service startup
I needed the possibility to modify the startup service, so I put this in. Now you are able to start bind in IPv4/IPv6 mode or passing some other variables.
In addition I had to fix some issues with concat_basedir to run rpsec tests locally.