Merge pull request #758 from mhaskel/loadfile_name_fixes

Missed some file resource namechanges.
xbezdick · Jun 3, 2014 · c2203ca · c2203ca
2 parents b02d29e + 9c3da14
commit c2203ca
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/manifests/mod.pp b/manifests/mod.pp
@@ -61,10 +61,10 @@
     # the module gets installed.
     $package_before = $::osfamily ? {
       'freebsd' => [
-        File["${mod}.load"],
+        File[$_loadfile_name],
         File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
       ],
-      default => File["${mod}.load"],
+      default => File[$_loadfile_name],
     }
     # $_package may be an array
     package { $_package:
@@ -91,15 +91,15 @@
 
   if $::osfamily == 'Debian' {
     $enable_dir = $::apache::mod_enable_dir
-    file{ "${mod}.load symlink":
+    file{ "${_loadfile_name} symlink":
       ensure  => link,
       path    => "${enable_dir}/${_loadfile_name}",
       target  => "${mod_dir}/${_loadfile_name}",
       owner   => 'root',
       group   => $::apache::params::root_group,
       mode    => '0644',
       require => [
-        File["${mod}.load"],
+        File[$_loadfile_name],
         Exec["mkdir ${enable_dir}"],
       ],
       before  => File[$enable_dir],