aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/preferences.pp2
-rw-r--r--manifests/unattended_upgrades.pp4
2 files changed, 4 insertions, 2 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 4c93542..71ef0a6 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -7,7 +7,7 @@ class apt::preferences {
content => $custom_preferences ? {
'' => $operatingsystem ? {
'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
- 'ubuntu' => '',
+ 'ubuntu' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
},
default => $custom_preferences
},
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index e2992f8..b90fcbb 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -6,7 +6,9 @@ class apt::unattended_upgrades {
}
apt_conf { "50unattended-upgrades":
- source => ["puppet:///modules/site-apt/50unattended-upgrades",
+ source => ["puppet:///modules/site-apt/$lsbdistcodename/50unattended-upgrades",
+ "puppet:///modules/site-apt/50unattended-upgrades",
+ "puppet:///modules/apt/$lsbdistcodename/50unattended-upgrades",
"puppet:///modules/apt/50unattended-upgrades" ],
require => Package['unattended-upgrades'],
}