summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_apt/manifests/init.pp')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp13
1 files changed, 2 insertions, 11 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 8821c110..9facf4cc 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,15 +1,6 @@
class site_apt {
- # on couchdb we need to include squeeze in apt preferences,
- # so the cloudant package can pull some packages from squeeze
- # template() must be unquoted !
- if 'couchdb' in $::services {
- $custom_preferences = template("site_apt/preferences.include_squeeze")
- } else {
- $custom_preferences = ''
- }
class { 'apt':
- custom_preferences => $custom_preferences,
custom_key_dir => 'puppet:///modules/site_apt/keys'
}
@@ -37,6 +28,6 @@ class site_apt {
# The creation of sources.list depends on the lsb package
File['/etc/apt/preferences'] ->
- Exec['refresh_apt']
- Package <| ( title != 'lsb' ) |>
+ Exec['refresh_apt'] ->
+ Package <| ( title != 'lsb' ) |>
}