Merge pull request #2526 from jcharaoui/debian-mime-support

Stop managing mime support package on Debian
puppetlabs · Apr 2, 2024 · dcc3072 · dcc3072
2 parents d59932f + 95a2ab0
commit dcc3072
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/mod/mime.pp b/manifests/mod/mime.pp
@@ -13,9 +13,9 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_mime.html for additional documentation.
 #
 class apache::mod::mime (
-  String $mime_support_package          = $apache::params::mime_support_package,
-  String $mime_types_config             = $apache::params::mime_types_config,
-  Optional[Hash] $mime_types_additional = undef,
+  Optional[String] $mime_support_package = $apache::params::mime_support_package,
+  String $mime_types_config              = $apache::params::mime_types_config,
+  Optional[Hash] $mime_types_additional  = undef,
 ) inherits apache::params {
   include apache
   $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional)

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -470,8 +470,8 @@
     $keepalive              = 'On'
     $keepalive_timeout      = 15
     $max_keepalive_requests = 100
-    $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
+    $mime_support_package = undef
     $docroot              = '/var/www/html'
     $cas_cookie_path      = '/var/cache/apache2/mod_auth_cas/'
     $mellon_lock_file     = undef