Renamed template for nginx config. #96
Closed
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
Renamed the file used as a template for the nginx configuration for the site from youtubedl.j2 to nginx_config.js. Why? 1. The name follows the convention for other config related templates, e.g. supervisor_config.j2 2. It is one less thing to change when adapting the playbook to run with another project.
When the name of the template was changed to make it application agnostic the contents remained untouched. This commit simply updates the content to match the version from master and so remove the conflicts that are blocking the PR from being merged.
|
@StuartMacKay I've been doing a lot of merging recently and although the TravisCI connection appears a little off (see #149) I'd love to help get this merged in. Would you try fixing conflicts and making sure the updated NGINX is just a renaming and doesn't include any changes? I believe we may have adjusted some configs in the interim while this PR was open. Thanks again! |
|
That last commit was an attempt to reconcile the contents so I don't understand why there's a conflct. I'll close this PR out, get the latest from master and resubmit it as a fresh PR |
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.
Renamed the file used as a template for the nginx configuration for the site from youtubedl.j2 to nginx_config.js. Why?
The name follows the convention for other config related templates, e.g. supervisor_config.j2
It is one less thing to change when adapting the playbook to run with another project.