Merge pull request puppetlabs#1232 from prabin5/dynamic_mime_template

Update mime.conf.erb to support dynamic AddHandler AddType AddOutputF…

Author: igalic

manifests/init.pp

@@ -77,6 +77,7 @@
   $package_ensure         = 'installed',
   $use_optional_includes  = $::apache::params::use_optional_includes,
   $use_systemd            = $::apache::params::use_systemd,
+  $mime_types_additional  = $::apache::params::mime_types_additional,
 ) inherits ::apache::params {
   validate_bool($default_vhost)
   validate_bool($default_ssl_vhost)

manifests/mod/mime.pp

@@ -1,6 +1,7 @@
 class apache::mod::mime (
   $mime_support_package = $::apache::params::mime_support_package,
   $mime_types_config    = $::apache::params::mime_types_config,
+  $mime_types_additional = $::apache::mime_types_additional,
 ) {
   apache::mod { 'mime': }
   # Template uses $mime_types_config

manifests/params.pp

@@ -29,6 +29,19 @@
   $log_level = 'warn'
   $use_optional_includes = false
 
+  # Default mime types settings
+  $mime_types_additional = {
+    'AddHandler' => {
+      'type-map' => 'var'
+      },
+    'AddType'    => {
+      'type-map' => '.shtml'
+      },
+    'AddOutputFilter' => {
+      'INCLUDES'      => '.shtml'
+      },
+  }
+
   # should we use systemd module?
   $use_systemd = true
 

spec/acceptance/mod_mime_spec.rb

@@ -32,6 +32,9 @@ class { 'apache': }
 
     describe file("#{mod_dir}/mime.conf") do
       it { is_expected.to contain "AddType application/x-compress .Z" }
+      it { is_expected.to contain "AddHandler type-map var\n" }
+      it { is_expected.to contain "AddType type-map .shtml\n" }
+      it { is_expected.to contain "AddOutputFilter INCLUDES .shtml\n" }
     end
   end
 end

templates/mod/mime.conf.erb

@@ -31,6 +31,8 @@ AddLanguage sv .sv
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 
-AddHandler type-map var
-AddType text/html .shtml
-AddOutputFilter INCLUDES .shtml
+<%- @mime_types_additional.sort.each do |add_mime, config| -%>
+        <%- config.each do |type, extension| %>
+<%= add_mime %> <%= type %> <%= extension%>
+        <%- end -%>
+<% end %>