Add mime.types file template and default values for it #1243
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
bastelfreak
reviewed
Sep 3, 2018
manifests/init.pp
Outdated
| @@ -147,6 +147,7 @@ | |||
| $package_source = 'nginx', | |||
| $package_flavor = undef, | |||
| $manage_repo = $nginx::params::manage_repo, | |||
| $mime_types = $nginx::params::mime_types, | |||
There was a problem hiding this comment.
Please add a datatype for the new parameter. Probably Hash[String[1], String[1]]
bastelfreak
reviewed
Sep 3, 2018
templates/conf.d/mime.types.erb
Outdated
| <% @mime_types.each do |key, value| -%> | ||
| <%= key %> <%= value %>; | ||
| <% end -%> | ||
| } |
There was a problem hiding this comment.
please add a trailing newline
bastelfreak
reviewed
Sep 3, 2018
templates/conf.d/mime.types.erb
Outdated
| @@ -0,0 +1,6 @@ | |||
| # MANAGED BY PUPPET | |||
There was a problem hiding this comment.
Please convert this to an epp template.
bastelfreak
added
enhancement
|
@bastelfreak Hi, I'll take care of it |
- The mine.types file can now be configured using a simple hash
|
I addressed the issues, but the Beaker tests blew up O_o |
bastelfreak
reviewed
Sep 3, 2018
templates/conf.d/mime.types.epp
Outdated
| types { | ||
| <% $nginx::mime_types.each |$key, $value| { -%> | ||
| <%= $key %> <%= $value %>; | ||
| <% } -%> |
bastelfreak
reviewed
Sep 3, 2018
templates/conf.d/mime.types.epp
Outdated
| <% $nginx::mime_types.each |$key, $value| { -%> | ||
| <%= $key %> <%= $value %>; | ||
| <% } -%> | ||
|
|
There was a problem hiding this comment.
Please do not an empty newline.
There was a problem hiding this comment.
To solve a bit of the confusion I might have created. A quote from our review docs:
- Files should always terminate with a newline if possible, with an exception being file or template fragments like those used with concat. This is the POSIX
standard, and some tools don't handle the lack of a terminating newline properly
|
@bastelfreak Ok, thanks. I'm not too familiar with EPP Templates yet. |
|
@bastelfreak Hi, should be fine now. |
bastelfreak
reviewed
Sep 7, 2018
| @@ -147,6 +147,7 @@ | |||
| $package_source = 'nginx', | |||
| $package_flavor = undef, | |||
| $manage_repo = $nginx::params::manage_repo, | |||
| Hash[String[1], String[1]] $mime_types = $nginx::params::mime_types, | |||
|
Thanks! |
cegeka-jenkins
pushed a commit
to cegeka/puppet-nginx
that referenced
this pull request
Sep 13, 2019
Add mime.types file template and default values for it
Rubueno
pushed a commit
to Rubueno/puppet-nginx
that referenced
this pull request
Oct 19, 2020
Add mime.types file template and default values for it
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.
Pull Request (PR) description
When using this module to only configure nginx and then run in a Container, we ran into an issue when we tried to store the config in a different directory. The config directory can be adjusted using the conf_dir parameter, however the module does not provide a mime.types file.
This PR fixes this issue by adding a simple mime.types.erb that can be filled with a hash, and some default values for the file.
This Pull Request (PR) fixes the following issues
Fixes #1240