summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-02-07 16:25:05 +0000
committerintrigeri <intrigeri@boum.org>2015-02-07 16:25:05 +0000
commit7c55bee06ab952c914b3a367f495e36a2539807f (patch)
tree39d3c2ca80305641ea85179cd8192949bccff09d /manifests
parent85c7554c4bb06130ab3e88170842dc1b2ddbb186 (diff)
parentc826a07dfec73811a35d67c269c0cc1629d71df9 (diff)
Merge remote-tracking branch 'shared/master' into feature/squeeze-lts
Diffstat (limited to 'manifests')
-rw-r--r--manifests/sources_list.pp8
1 files changed, 5 insertions, 3 deletions
diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp
index 3367f83..aefad2d 100644
--- a/manifests/sources_list.pp
+++ b/manifests/sources_list.pp
@@ -15,22 +15,24 @@ define apt::sources_list (
include apt::dot_d_directories
+ $realname = regsubst($name, '\.list$', '')
+
# One would expect the 'file' resource on sources.list.d to trigger an
# apt-get update when files are added or modified in the directory, but it
# apparently doesn't.
- file { "/etc/apt/sources.list.d/${name}":
+ file { "/etc/apt/sources.list.d/${realname}.list":
ensure => $ensure,
owner => root, group => 0, mode => '0644',
notify => Exec['refresh_apt'],
}
if $source {
- File["/etc/apt/sources.list.d/${name}"] {
+ File["/etc/apt/sources.list.d/${realname}.list"] {
source => $source,
}
}
else {
- File["/etc/apt/sources.list.d/${name}"] {
+ File["/etc/apt/sources.list.d/${realname}.list"] {
content => $content,
}
}