Remove File reference to nginx default.conf #6
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
|
Looks good to me, LET THERE BE MERGE! |
Ooblioob
added a commit
that referenced
this pull request
May 1, 2014
Remove File reference to nginx default.conf
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.
puppet-nginx's installation process left default.conf in the configuration directory, which caused issues with the other configuration files generated by puppet-nginx. As a result, our internal puppet manifests made sure the default.conf was removed after installing nginx.
voxpupuli/puppet-nginx#285 added the identical functionality to the puppet-nginx module, which caused a puppet error due to duplicate File object definitions. Since the puppet-nginx object performs the same action, we can safely remove the default.conf File objects from the internal puppet manifests.
Thanks for @DarthDippy for finding this