Skip to content
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

Make service ntp started on boot -> service 'ntp' { enable=>$enable... #33

Merged
merged 8 commits into from
Dec 10, 2012

Conversation

codingtony
Copy link
Contributor

added the "enable" property to make ntp start on boot

@ryanycoleman
Copy link

Thanks for the contribution @codingtony. Would you mind rebasing this on master so that we can finally get this merged in?

@codingtony
Copy link
Contributor Author

@RColeman I'm pretty sure I messed things up with this merge, I'm not familiar with the process, could you help me out with this ?

@ryanycoleman
Copy link

The end-result looks good @codingtony but I see what you mean about all the superfluous commits. I'll see what I can do to squash them down after lunch PST. Thanks!

@codingtony
Copy link
Contributor Author

@RColeman is there a way I can fix it myself ?

@mmoll
Copy link
Contributor

mmoll commented Dec 10, 2012

@codingtony have a look here:
http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
When everything is boiled down to one commit, push with -f

BillWeiss and others added 8 commits December 10, 2012 16:12
Puppet-lint was complaining about "ensure found on line but it's not the
first attribute on line 109".  Trivial fix (swapped the ensure and the
name).

Also, the README didn't mention Debian or CentOS, but the comment block
in init.pp did.  I added both to the README.  I happen to be using this
with Debian unstable, but I haven't tested it extensively enough to say
"yep, this works".  It, however, works for me.
NTP servers should not restrict themselves to 127.0.0.1, and this commit
adds a `restrict` parameter to enable/disable this configuration block
in the relevent templates.
0.2.0 is a backwards compatible feature and bug-fix release. Since
0.1.0, support for Amazon Linux was added, fixes for style were
implemented and support was added for tinker_panic. tinker_panic
will default to on when the fact is_virtual is true.
@codingtony
Copy link
Contributor Author

I think it's better now...

@ryanycoleman
Copy link

Awesome, thanks @codingtony. I'm merging this in now.

ryanycoleman pushed a commit that referenced this pull request Dec 10, 2012
Make service ntp started on boot -> service 'ntp' { enable=>$enable...
@ryanycoleman ryanycoleman merged commit 149575c into puppetlabs:master Dec 10, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants