-
-
Notifications
You must be signed in to change notification settings - Fork 883
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
Rename v[hH]ost to server everywhere #980
Conversation
This looks good to me, can you just tidy up the rest of the hashrocket and = alignment, and then I'll merge? Let's also try to not merge anything else until this gets merged so we don't have to redo it again. @3flex: I totally agree that your way is a bit more elegant, unfortunately, I don't have the time / energy to implement it properly, however, if someone wants to pick up that torch, I'd be happy to wait on the next release until we can rework this to use your model. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you tidy up the hashrocket and = alignment, even in spots where rubocop and / or puppet-lint don't complain? Other than that, let's try to get this one out quickly so we don't have to re-do it again 👍
829a080
to
4ce5472
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some old code has been reintroduced here, might need to search/replace on latest master so it doesn't get added back by accident.
} else { | ||
$content_real = template('nginx/server/locations/empty.erb') | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This block shouldn't have been added back. I think you'll have to do the search/replace on the latest code from master.
@@ -261,9 +259,6 @@ | |||
if ($fastcgi_split_path != undef) { | |||
validate_string($fastcgi_split_path) | |||
} | |||
if ($fastcgi_index != undef) { | |||
validate_string($fastcgi_index) | |||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be removed
Lint fixes. Formatting Replace stale code and re-format
4ce5472
to
4b8c57f
Compare
@3flex good catch on that other stuff. |
Common people. Breaking changes are major bumps. Not minor. Read semver.org. |
Aside from the fact that this was merged and released years ago (https://github.com/voxpupuli/puppet-nginx/blob/master/CHANGELOG.md#v060-2017-01-13): https://semver.org/#spec-item-4
|
Breaking change: rename v[hH]ost to server everywhere
Replaces PR: #968 This addresses rebase/sed and [vV]host as well as linting.