Merge pull request #447 from ptomulik/mod_mime_params

Add new params to apache::mod::mime class

manifests/mod/mime.pp

@@ -1,6 +1,9 @@
-class apache::mod::mime {
+class apache::mod::mime (
+  $mime_support_package = $apache::params::mime_support_package,
+  $mime_types_config    = $apache::params::mime_types_config,
+) {
   apache::mod { 'mime': }
-  # Template uses no variables
+  # Template uses $mime_types_config
   file { 'mime.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/mime.conf",
@@ -9,4 +12,10 @@
     before  => File[$apache::mod_dir],
     notify  => Service['httpd'],
   }
+  if $mime_support_package {
+    package { $mime_support_package:
+      ensure => 'installed',
+      before => File["${apache::mod_dir}/mime.conf"],
+    }
+  }
 }

manifests/params.pp

@@ -87,6 +87,8 @@
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
     $fastcgi_lib_path     = undef
+    $mime_support_package = 'mailcap'
+    $mime_types_config    = '/etc/mime.types'
   } elsif $::osfamily == 'Debian' {
     $user             = 'www-data'
     $group            = 'www-data'
@@ -138,6 +140,8 @@
     $keepalive         = 'Off'
     $keepalive_timeout = 15
     $fastcgi_lib_path  = '/var/lib/apache2/fastcgi'
+    $mime_support_package = 'mime-support'
+    $mime_types_config = '/etc/mime.types'
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }

templates/mod/mime.conf.erb

@@ -1,4 +1,4 @@
-TypesConfig /etc/mime.types
+TypesConfig <%= @mime_types_config %>
 
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz