Add 15.10 support

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

diff --git a/manifests/params.pp b/manifests/params.pp
index 0b1afe74aa66b0bcde2d50aa63edbb64188270ce..a8f014b8f3c61f244cc2df7c8173fb7683a460c9 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,7 +6,7 @@ class apt::params {
 
   # prior to puppet 3.5.0, defined couldn't test if a variable was defined
   # strict variables wasn't added until 3.5.0, so this should be fine.
-  if versioncmp($::puppetversion, '3.5.0') < 0 {
+  if ! $::settings::strict_variables {
     $xfacts = {
       'lsbdistcodename'     => $::lsbdistcodename,
       'lsbdistrelease'      => $::lsbdistrelease,
@@ -61,7 +61,7 @@ class apt::params {
     },
     'pref'   => {
       'path' => $preferences_d,
-      'ext'  => '',
+      'ext'  => '.pref',
     },
     'list'   => {
       'path' => $sources_list_d,
@@ -76,9 +76,10 @@ class apt::params {
   }
 
   $proxy_defaults = {
-    'host'  => undef,
-    'port'  => 8080,
-    'https' => false,
+    'ensure' => undef,
+    'host'   => undef,
+    'port'   => 8080,
+    'https'  => false,
   }
 
   $purge_defaults = {
@@ -105,14 +106,14 @@ class apt::params {
       case $xfacts['lsbdistcodename'] {
         'squeeze': {
           $backports = {
-            'location' => 'http://backports.debian.org/debian-backports',
+            'location' => 'http://httpredir.debian.org/debian-backports',
             'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
             'repos'    => 'main contrib non-free',
           }
         }
         default: {
           $backports = {
-            'location' => 'http://ftp.debian.org/debian/',
+            'location' => 'http://httpredir.debian.org/debian',
             'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
             'repos'    => 'main contrib non-free',
           }
@@ -139,7 +140,7 @@ class apt::params {
           $ppa_options        = '-y'
           $ppa_package        = 'python-software-properties'
         }
-        'trusty', 'utopic', 'vivid': {
+        'trusty', 'utopic', 'vivid', 'wily': {
           $ppa_options        = '-y'
           $ppa_package        = 'software-properties-common'
         }