Clean up includes and templates in vhost.pp #2254
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
|
@ekohl Looks like some spec test failures have crept in |
This is now only included if docroot evaluates to true. The template does suggest that it should be `($docroot or $virtual_docroot)` but this remains compatible with the previous code.
The apache::mod::mime inclusion is dropped since apache::mod::ssl already includes it (since fc8fee7) and apache/vhost/_ssl.erb does not use AddType.
There is no need to check if the variables are true because the data type doesn't allow anything that evaluates to false. The logic to include it is also moved to the template which makes it easier to follow the logic. The same is applied to the template.
The data type only allows an array for scriptaliases so there is no need to check for the type. It is also checked at in vhost.pp that the value is set so there's no need to repeat that logic in the template.
The data type does not allow a value that evaluates to false so no need ot check for it.
|
Acceptance is still running, but this looks like it'll be green. |
|
And that's another one in, sorry for the wait on merge, was off yesterday |
|
No worries, thanks for the merge. |
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.
This localizes the includes in vhost.pp which removes some duplicated logic. Sometimes the logic was also slightly different. This keeps it consistent.
It also only includes modules if ensure is set to present. This allows users to toggle the ensure easily and only having the minimal amount of modules present.