diff modules/apache/manifests/package.pp @ 437:b8d6ada284dd

Update Apache module to latest version Also converted some params to ints to match
author IBBoard <dev@ibboard.co.uk>
date Sun, 14 Aug 2022 11:30:13 +0100
parents d9352a684e62
children
line wrap: on
line diff
--- a/modules/apache/manifests/package.pp	Wed Apr 19 18:45:23 2023 +0100
+++ b/modules/apache/manifests/package.pp	Sun Aug 14 11:30:13 2022 +0100
@@ -3,16 +3,15 @@
 #
 # @api private
 class apache::package (
-  $ensure     = 'present',
-  $mpm_module = $::apache::params::mpm_module,
-) inherits ::apache::params {
-
+  String $ensure     = 'present',
+  String $mpm_module = $apache::params::mpm_module,
+) inherits apache::params {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'FreeBSD': {
       case $mpm_module {
         'prefork': {
@@ -35,7 +34,7 @@
 
   package { 'httpd':
     ensure => $ensure,
-    name   => $::apache::apache_name,
+    name   => $apache::apache_name,
     notify => Class['Apache::Service'],
   }
 }