no longer enforce default value for $apache_name

fraenki · Steven Post · commit 4290182ba4b0 · 2015-03-27T09:58:01.000+01:00
diff --git a/manifests/package.pp b/manifests/package.pp
@@ -44,10 +44,10 @@
           before => Package['httpd'],
         }
       }
-      $apache_package = $::apache::params::apache_name
+      $apache_package = $::apache::apache_name
     }
     default: {
-      $apache_package = $::apache::params::apache_name
+      $apache_package = $::apache::apache_name
     }
   }
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -125,7 +125,7 @@
     fail('You must include the apache base class before using any apache defined resources')
   }
 
-  $apache_name = $::apache::params::apache_name
+  $apache_name = $::apache::apache_name
 
   validate_re($ensure, '^(present|absent)$',
   "${ensure} is not supported for ensure.

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@`
`44`	`44`	`before => Package['httpd'],`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`- $apache_package = $::apache::params::apache_name`
	`47`	`+ $apache_package = $::apache::apache_name`
`48`	`48`	`}`
`49`	`49`	`default: {`
`50`		`- $apache_package = $::apache::params::apache_name`
	`50`	`+ $apache_package = $::apache::apache_name`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@`
`125`	`125`	`fail('You must include the apache base class before using any apache defined resources')`
`126`	`126`	`}`
`127`	`127`
`128`		`- $apache_name = $::apache::params::apache_name`
	`128`	`+ $apache_name = $::apache::apache_name`
`129`	`129`
`130`	`130`	`validate_re($ensure, '^(present\|absent)$',`
`131`	`131`	`"${ensure} is not supported for ensure.`