aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/default_sources_list.pp3
-rw-r--r--manifests/init.pp6
2 files changed, 4 insertions, 5 deletions
diff --git a/manifests/default_sources_list.pp b/manifests/default_sources_list.pp
index 8c14b53..7db6535 100644
--- a/manifests/default_sources_list.pp
+++ b/manifests/default_sources_list.pp
@@ -1,10 +1,11 @@
class apt::default_sources_list {
+ include lsb
config_file {
# include main, security and backports
# additional sources could be included via an array
"/etc/apt/sources.list":
content => template("apt/sources.list.erb"),
- require => Exec[assert_lsbdistcodename];
+ require => Package['lsb'];
}
}
diff --git a/manifests/init.pp b/manifests/init.pp
index c2dd547..eaf6bb8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,17 +13,15 @@ class apt {
package { apt: ensure => installed }
- # a few templates need lsbdistcodename
- include assert_lsbdistcodename
-
case $custom_sources_list {
'': {
include apt::default_sources_list
}
default: {
+ include lsb
config_file { "/etc/apt/sources.list":
content => $custom_sources_list,
- require => Exec[assert_lsbdistcodename];
+ require => Exec['lsb'];
}
}
}