Merge pull request #1268 from bryangwilliam/custom_mime_types

allow adding custom mime types while still using the module defaults

manifests/config.pp

@@ -83,7 +83,10 @@
   $log_format                     = $nginx::log_format
   $mail                           = $nginx::mail
   $stream                         = $nginx::stream
-  $mime_types                     = $nginx::mime_types
+  $mime_types                     = $nginx::mime_types_preserve_defaults ? {
+    true    => merge($nginx::params::mime_types,$nginx::mime_types),
+    default => $nginx::mime_types,
+  }
   $multi_accept                   = $nginx::multi_accept
   $names_hash_bucket_size         = $nginx::names_hash_bucket_size
   $names_hash_max_size            = $nginx::names_hash_max_size

manifests/init.pp

@@ -149,6 +149,7 @@
   $package_flavor                                            = undef,
   Boolean $manage_repo                                       = $nginx::params::manage_repo,
   Hash[String[1], String[1]] $mime_types                     = $nginx::params::mime_types,
+  Boolean $mime_types_preserve_defaults                      = false,
   Optional[String] $repo_release                             = undef,
   $passenger_package_ensure                                  = 'present',
   ### END Package Configuration ###

spec/classes/nginx_spec.rb

@@ -893,6 +893,18 @@
             it { is_expected.to contain_file('/etc/nginx/mime.types').with_content(%r{audio/mpeg mp3;}) }
           end
 
+          context 'when mime.types is "[\'custom/file customfile\']" and mime.types.preserve.defaults is true' do
+            let(:params) do
+              {
+                mime_types: { 'custom/file' => 'customfile' },
+                mime_types_preserve_defaults: true
+              }
+            end
+
+            it { is_expected.to contain_file('/etc/nginx/mime.types').with_content(%r{audio/mpeg mp3;}) }
+            it { is_expected.to contain_file('/etc/nginx/mime.types').with_content(%r{custom/file customfile;}) }
+          end
+
           context 'when dynamic_modules is "[\'ngx_http_geoip_module\']" ' do
             let(:params) do
               {

templates/conf.d/mime.types.epp

@@ -1,6 +1,6 @@
 # MANAGED BY PUPPET
 types {
-<% $nginx::mime_types.each |$key, $value| { -%>
+<% $nginx::config::mime_types.each |$key, $value| { -%>
     <%= $key %> <%= $value %>;
 <% } -%>
 }