summaryrefslogtreecommitdiff
path: root/manifests/preferences_snippet.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-08-05 10:57:13 +0200
committerintrigeri <intrigeri@boum.org>2012-04-11 11:35:31 +0200
commit8996d83489159ec34187a18d18bc0d7566f2cbe5 (patch)
treefc13dd2e80892e2a6d54aca0294899fb28480580 /manifests/preferences_snippet.pp
parenta835369958226bac2d010fedb50ed5ef98b5906f (diff)
migrate concatenated_file to the concat module
Diffstat (limited to 'manifests/preferences_snippet.pp')
-rw-r--r--manifests/preferences_snippet.pp10
1 files changed, 4 insertions, 6 deletions
diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 4b8e575..bcc12de 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -11,11 +11,9 @@ define apt::preferences_snippet(
include apt::preferences
- file { "${apt::preferences::apt_preferences_dir}/${name}":
+ concat::fragment{"apt_preference_${name}":
ensure => $ensure,
- #TODO this template is somewhat limited
- notify => Exec["concat_${apt::preferences::apt_preferences_dir}"],
- owner => root, group => 0, mode => 0600;
+ target => '/etc/apt/preferences',
}
# This should really work in the same manner as sources_list and apt_conf
@@ -23,12 +21,12 @@ define apt::preferences_snippet(
# lenny, we can't generalize without going into ugly special-casing.
case $source {
'': {
- File["${apt::preferences::apt_preferences_dir}/${name}"] {
+ Concat::Fragment[$name]{
content => template("apt/preferences_snippet.erb")
}
}
default: {
- File["${apt::preferences::apt_preferences_dir}/${name}"] {
+ Concat::Fragment[$name]{
source => $source
}
}