Missed the - for -y, but also tests were missing lsbdistid

[puppet-modules/puppetlabs-apt.git] / manifests / params.pp

diff --git a/manifests/params.pp b/manifests/params.pp
index 99e8d40d861ba769f0c213c3386d2ddb00ed2891..51a01be91a9f07772a606a6afbc30801ccedbc34 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,6 +11,9 @@ class apt::params {
         'squeeze': {
           $backports_location = 'http://backports.debian.org/debian-backports'
         }
+        'wheezy': {
+          $backports_location = 'http://ftp.debian.org/debian/'
+        }
         default: {
           $backports_location = 'http://http.debian.net/debian/'
         }
@@ -18,11 +21,17 @@ class apt::params {
     }
     'ubuntu': {
       case $::lsbdistcodename {
-        'hardy','lucid','maverick','natty','oneiric','precise': {
+        'hardy','maverick','natty','oneiric','precise': {
+          $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
+          $ppa_options = '-y'
+        }
+        'lucid': {
           $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
+          $ppa_options = undef
         }
         default: {
           $backports_location = 'http://old-releases.ubuntu.com/ubuntu'
+          $ppa_options = '-y'
         }
       }
     }