apt::key: Be explicit about the keyserver.

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

diff --git a/manifests/params.pp b/manifests/params.pp
index 3aba99e3112b1ae68761a2f57ca149bffbb0fc98..14401c6c930b19ed9eae71a08d81e22cf64d7f9f 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,4 +1,9 @@
 class apt::params {
+
+  if $caller_module_name and $caller_module_name != $module_name {
+    fail('apt::params is a private class and cannot be accessed directly')
+  }
+
   $root           = '/etc/apt'
   $provider       = '/usr/bin/apt-get'
   $sources_list   = "${root}/sources.list"
@@ -6,6 +11,7 @@ class apt::params {
   $conf_d         = "${root}/apt.conf.d"
   $preferences    = "${root}/preferences"
   $preferences_d  = "${root}/preferences.d"
+  $keyserver      = 'keyserver.ubuntu.com'
 
   if $::osfamily != 'Debian' {
     fail('This module only works on Debian or derivatives like Ubuntu')
@@ -26,6 +32,33 @@ class apt::params {
     }
   }
 
+  $update_defaults = {
+    'always'    => false,
+    'frequency' => 'reluctantly',
+    'timeout'   => undef,
+    'tries'     => undef,
+  }
+
+  $proxy_defaults = {
+    'host'  => undef,
+    'port'  => 8080,
+    'https' => false,
+  }
+
+  $purge_defaults = {
+    'sources.list'   => true,
+    'sources.list.d' => true,
+    'preferences'    => true,
+    'preferences.d'  => true,
+  }
+
+  $source_key_defaults = {
+    'server'  => $keyserver,
+    'options' => undef,
+    'content' => undef,
+    'source'  => undef,
+  }
+
   $file_defaults = {
     'owner' => 'root',
     'group' => 'root',
@@ -64,12 +97,19 @@ class apt::params {
       case $distcodename {
         'lucid': {
           $ppa_options        = undef
+          $ppa_package        = 'python-software-properties'
+        }
+        'precise': {
+          $ppa_options        = '-y'
+          $ppa_package        = 'python-software-properties'
         }
-        'precise', 'trusty', 'utopic', 'vivid': {
+        'trusty', 'utopic', 'vivid': {
           $ppa_options        = '-y'
+          $ppa_package        = 'software-properties-common'
         }
         default: {
           $ppa_options        = '-y'
+          $ppa_package        = 'software-properties-common'
         }
       }
     }