summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2013-01-08 13:54:57 +0100
committerintrigeri <intrigeri@boum.org>2013-01-08 14:05:49 +0100
commit354283d54ea4f03a4ecdb53db2868ec1ced87dbc (patch)
tree13dc58b9892f196d954c98ffa60b08ecdb393b3c /manifests
parent2fe3df225c1144d108a7f33f90344310b55687a4 (diff)
parentf3daf58b9eb14aba385c20abb73191c0c408f367 (diff)
Merge remote-tracking branch 'leap/feature/unattended_upgrades' into review
Conflicts: files/lenny/50unattended-upgrades
Diffstat (limited to 'manifests')
-rw-r--r--manifests/unattended_upgrades.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index d2a2352..c538831 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -9,7 +9,8 @@ class apt::unattended_upgrades {
source => [
"puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
'puppet:///modules/site_apt/50unattended-upgrades',
- "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ],
+ "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades",
+ 'puppet:///modules/apt/50unattended-upgrades' ],
require => Package['unattended-upgrades'],
}