aboutsummaryrefslogtreecommitdiff
path: root/manifests/sources_list.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-31 14:50:07 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-31 14:50:07 -0300
commitb65996f7ae03d2bae118855a3c4d94a3947e556d (patch)
tree5bab8e5c3663aaabca34ebcee3c706c4fbc35cb5 /manifests/sources_list.pp
parentb0425c65ecc61c6af3f31fba577b1e1c5d880674 (diff)
parent8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff)
downloadpuppet-apt-b65996f7ae03d2bae118855a3c4d94a3947e556d.tar.gz
puppet-apt-b65996f7ae03d2bae118855a3c4d94a3947e556d.tar.bz2
Merge remote-tracking branch 'shared/master' into developHEADmasterdevelop
Conflicts: README files/Debian/50unattended-upgrades.lenny files/Debian/50unattended-upgrades.wheezy manifests/init.pp manifests/params.pp manifests/unattended_upgrades.pp templates/Debian/preferences_jessie.erb templates/Debian/sources.list.erb
Diffstat (limited to 'manifests/sources_list.pp')
-rw-r--r--manifests/sources_list.pp10
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp
index 3367f83..0ee068d 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'],
+ notify => Exec['apt_updated'],
}
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,
}
}