fix modules directory stuff

diff --git a/manifests/module_dir.pp b/manifests/module_dir.pp
deleted file mode 100644 (file)
index 6dcfca3..0000000
--- a/manifests/module_dir.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apt::module_dir {
-  module_dir{'apt': }
-}

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index b106153118094b3fb2158efbf4cade58e0480e70..e806f9f3f92851e1d16cc541325f7bc14cbfc9a5 100644 (file)
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -1,9 +1,10 @@
 class apt::preferences {
 
-  include apt::module_dir
+  include common::moduledir
+  $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences"
   module_dir{'apt/preferences': }
   concatenated_file{'/etc/apt/preferences':
-    dir => '/var/lib/puppet/modules/apt/preferences',
+    dir => $apt_preferences_dir,
     header => 'Package: *
 Pin: release a=unstable
 Pin-Priority: 1

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 8d82a42fd1cf2b6c949dd0ea173d4ca1ad387749..e5393bde8f4484f8e574d4afa6b98bf71e20f400 100644 (file)
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -3,13 +3,14 @@ define apt::preferences_snippet(
   $release,
   $priority
 ){
-  file { "/var/lib/puppet/modules/apt/preferences/${name}":
+  include apt::preferences_snippet
+  file { "${apt::preferences::apt_preferences_dir}/${name}":
     ensure => $ensure,
     content => "Package: ${name}
 Pin: release a=${release}
 Pin-Priority: ${priority}
 ",
-    notify => Exec['concat_/var/lib/puppet/modules/apt/preferences'],
+    notify => Exec["concat_${apt::preferences::apt_preferences_dir}"],
     owner => root, group => 0, mode => 0600;
   }
 }