Pull feature location cfg #29
Merged
Conversation
This file contains 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
…vhosts defined Description: When running first time from scratch, if class was included without any setup at all and with sane defaults, in debian squeeze generates an error when trying to collect non existant vhosts, because cat complains that can not expand * because there are no files. Changed: Added unless to check that at least there is a file in nginx.d by testing it can expand.
…new structure, backwards compatible Defaults are set inside params, nginx class will set default and send it from local var to nginx::config, so even when there is no need for set default values on nginx::config, in case someone already using this module it's for some reason calling directly nginx::config, to avoid breaking anything defaults are set inside nginx::config too.
Added confd_purge option to tell it to purge files non managed by pupet in conf.d, default is false.
… on each service restart, therefore if user submit an invalid configuration nginx won't stop and realize too late that it can start again. By default it's false, if true it assumes you will have a working /etc/init.d/nginx which accepts configtest and restart.
If stub_status is provided as true a location will be created to provide nginx status information from stub_status module.
This is the best way I found to tackle the problem of custom directives, trying to avoid common usage of module involve hacking the module/template to be able place custom directives. Right now support was added only for location context (default and custom ones), it expects a hash with key value and it's supported on all current location types. Added an example inside location.pp, usage it's pretty easy.
|
Clearly I don't understand git yet... if I run git diff only changes done on last commit are shown, I expected this pull will show only the commit that changes code, which is the last one. You already merged the other 7 commits, and I started this branch from latest master with my changes pulled inside. So how come it shows my other 7 commits inside this pull? Hope it's not a problem for you. |
|
Guzmán: I'm not sure how you're pushing commits like you are, but they're not a problem thus far. Try taking a look at https://help.github.com/articles/using-pull-requests if you haven't already. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
James,
This is the best way I found to tackle the problem of custom directives, trying to
avoid common usage of module involve hacking the module/template to be able place
custom directives.
Right now support was added only for location context (default and custom ones),
it expects a hash with key value and it's supported on all current location types.
Added an example inside location.pp, usage it's pretty easy.