search

evertrue / zookeeper-cookbook

Chef cookbook for installing and managing Zookeeper.
https://supermarket.chef.io/cookbooks/zookeeper
Apache License 2.0
81 stars 119 forks source link

Add install-only recipe #96

Closed Gazzonyx closed 10 years ago

Gazzonyx commented 10 years ago

Added functionality to only create zookeeper user and install files with a new recipe 'install' which is just a subset of the default recipe. The default recipe continues to work as it did before.

Signed-off-by: Scott Lovenberg scott.lovenberg@gmail.com

jakedavis commented 10 years ago

Hey @Gazzonyx,

Thanks for the PR. Could you back out the CHANGELOG and metadata changes? I can take it from there and get this merged. Thank you!

Gazzonyx commented 10 years ago

No problem, @jakedavis. I'll make those changes in the morning. I wasn't sure if they made your life easier or not.

Along the same thread, I created the new file with a copyright under my employer's name with the same license because I wasn't sure if I could create a new file and use your copyright. That is, I'm not sure if I can copyright my work to your company. Do you care either way on this? I don't care either way (I'm scratching an itch, but it's easier to upstream it than maintain my own fork) so long as nothing interrupts the license. If you want me to change it, let me know and I'll bundle that with the changes to the CHANGELOG and metadata when I get into the office in the morning.

jakedavis commented 10 years ago

@Gazzonyx, I've consulted someone internally with a bit more knowledge than me and they think copywriting to Simple is fine. Would you mind changing that as well? Thank you!

jeffbyrnes commented 10 years ago

@Gazzonyx we've always considered that any work we provided falls within the copyright of the larger work, so while we might put our name on it, we always use the same license & copyright.

Gazzonyx commented 10 years ago

Sounds reasonable. I'm never sure because copyright law doesn't seem to operate on common sense, so I always err on the side of caution.

I'll respin this and send a new PR. Thanks, guys!

jeffbyrnes commented 10 years ago

@Gazzonyx you could just rebase & force-push your changes onto your existing branch, and this PR will update to follow suit. Up to you!

Gazzonyx commented 10 years ago

Okay, that should work. Git was a bit cranky about another change that I made to README.md, but https://github.com/Gazzonyx/chef-zookeeper/commit/0c908189e132b32a59ac252893a054cc01f7903c should be good.

jeffbyrnes commented 10 years ago

@Gazzonyx still includes the README & CHANGELOG stuff, (came in as part of https://github.com/Gazzonyx/chef-zookeeper/commit/0c908189e132b32a59ac252893a054cc01f7903c). If you git rebase -i HEAD~2 and then just remove the line corresponding to that commit, then git push -f origin master, you should set your branch aright & fix this PR.

For future, it's best to create separate branches on your fork for introducing new features, just in case you have to do this sort of jiggery pokery.

Gazzonyx commented 10 years ago

@jeffbyrnes, sorry about that. I'm terrible with git. I'll try that and push.

jakedavis commented 10 years ago

Heh, rebasing is hard :) it's a realm of git I need to learn better too. I can live with the single quote change in metadata, so I think we're good to go here now. Thanks for doing that.

Gazzonyx commented 10 years ago

NP, thanks for your patience while I stumbled through a rebase. :)

I like @jeffbyrnes suggestion of using a separate branch for these additions. I think it would have been much smoother that way.