diff options
| -rw-r--r-- | manifests/module_dir.pp | 3 | ||||
| -rw-r--r-- | manifests/preferences.pp | 5 | ||||
| -rw-r--r-- | manifests/preferences_snippet.pp | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/manifests/module_dir.pp b/manifests/module_dir.pp deleted file mode 100644 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 b106153..e806f9f 100644 --- 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 8d82a42..e5393bd 100644 --- 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; } } |