Merge pull request #445 from mhaskel/updates_everywhere

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

diff --git a/manifests/params.pp b/manifests/params.pp
index 3aba99e3112b1ae68761a2f57ca149bffbb0fc98..3c169e3fcfa8c05a32e395f0fee531f9dd6ae8fc 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"
@@ -26,6 +31,11 @@ class apt::params {
     }
   }
 
+  $proxy = {
+    'host' => undef,
+    'port' => 8080,
+  }
+
   $file_defaults = {
     'owner' => 'root',
     'group' => 'root',
@@ -64,12 +74,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'
         }
       }
     }