X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=3ce8f4864007f151262e64f0fab3208bfa1ed5a3;hb=refs%2Fheads%2Fpdksync_%28MAINT%29_Pin_puppetlabs-puppet_agent;hp=8799f7b98e8be829aaa1bd741b042da9a73f8a37;hpb=ea4f615735d5fb6bb6b0fcbd735da76e0bb45c06;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/params.pp b/manifests/params.pp
index 8799f7b..3ce8f48 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,21 +1,36 @@
+# @summary Provides defaults for the Apt module parameters.
+#
+# @api private
+#
 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"
-  $sources_list_d = "${root}/sources.list.d"
-  $conf_d         = "${root}/apt.conf.d"
-  $preferences    = "${root}/preferences"
-  $preferences_d  = "${root}/preferences.d"
-
-  if $::osfamily != 'Debian' {
+  if $facts['os']['family'] != 'Debian' {
     fail('This module only works on Debian or derivatives like Ubuntu')
   }
 
+  $root                 = '/etc/apt'
+  $provider             = '/usr/bin/apt-get'
+  $sources_list         = "${root}/sources.list"
+  $sources_list_force   = false
+  $sources_list_d       = "${root}/sources.list.d"
+  $trusted_gpg_d        = "${root}/trusted.gpg.d"
+  $conf_d               = "${root}/apt.conf.d"
+  $preferences          = "${root}/preferences"
+  $preferences_d        = "${root}/preferences.d"
+  $apt_conf_d           = "${root}/apt.conf.d"
+  $keyserver            = 'keyserver.ubuntu.com'
+  $key_options          = undef
+  $confs                = {}
+  $update               = {}
+  $purge                = {}
+  $proxy                = {}
+  $sources              = {}
+  $keys                 = {}
+  $ppas                 = {}
+  $pins                 = {}
+  $settings             = {}
+  $manage_auth_conf     = true
+  $auth_conf_entries    = []
+
   $config_files = {
     'conf'   => {
       'path' => $conf_d,
@@ -23,94 +38,71 @@ class apt::params {
     },
     'pref'   => {
       'path' => $preferences_d,
-      'ext'  => '',
+      'ext'  => '.pref',
     },
     'list'   => {
       'path' => $sources_list_d,
       'ext'  => '.list',
-    }
+    },
   }
 
   $update_defaults = {
-    'always'    => false,
     'frequency' => 'reluctantly',
+    'loglevel'  => undef,
     'timeout'   => undef,
     'tries'     => undef,
   }
 
   $proxy_defaults = {
-    'host'  => undef,
-    'port'  => 8080,
-    'https' => false,
+    'ensure'     => undef,
+    'host'       => undef,
+    'port'       => 8080,
+    'https'      => false,
+    'https_acng' => false,
+    'direct'     => false,
   }
 
   $purge_defaults = {
-    'sources.list'   => true,
-    'sources.list.d' => true,
-    'preferences'    => true,
-    'preferences.d'  => true,
-  }
-
-  $source_key_defaults = {
-    'server'  => $default_keyserver,
-    'options' => undef,
-    'content' => undef,
-    'source'  => undef,
+    'sources.list'   => false,
+    'sources.list.d' => false,
+    'preferences'    => false,
+    'preferences.d'  => false,
+    'apt.conf.d'     => false,
   }
 
-  $file_defaults = {
-    'owner' => 'root',
-    'group' => 'root',
-    'mode'  => '0644',
+  $include_defaults = {
+    'deb' => true,
+    'src' => false,
   }
 
-  case $::lsbdistid {
-    'ubuntu', 'debian': {
-      $distid = $::lsbdistid
-      $distcodename = $::lsbdistcodename
+  case $facts['os']['name'] {
+    'Debian': {
+      $backports = {
+        'location' => 'http://deb.debian.org/debian',
+        'repos'    => 'main contrib non-free',
+      }
+      $ppa_options = undef
+      $ppa_package = undef
+      $auth_conf_owner = '_apt'
     }
-    'linuxmint': {
-      if $::lsbdistcodename == 'debian' {
-        $distid = 'debian'
-        $distcodename = 'wheezy'
-      } else {
-        $distid = 'ubuntu'
-        $distcodename = $::lsbdistcodename ? {
-          'qiana'  => 'trusty',
-          'petra'  => 'saucy',
-          'olivia' => 'raring',
-          'nadia'  => 'quantal',
-          'maya'   => 'precise',
-        }
+    'Ubuntu': {
+      $backports = {
+        'location' => 'http://archive.ubuntu.com/ubuntu',
+        'key'      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+        'repos'    => 'main universe multiverse restricted',
       }
+      $ppa_options        = ['-y']
+      $ppa_package        = 'software-properties-common'
+      $auth_conf_owner = '_apt'
     }
-    '': {
-      fail('Unable to determine lsbdistid, is lsb-release installed?')
+    undef: {
+      fail('Unable to determine value for fact os[\"name\"]')
     }
     default: {
-      fail("Unsupported lsbdistid (${::lsbdistid})")
-    }
-  }
-  case $distid {
-    'ubuntu': {
-      case $distcodename {
-        'lucid': {
-          $ppa_options        = undef
-          $ppa_package        = 'python-software-properties'
-        }
-        'precise': {
-          $ppa_options        = '-y'
-          $ppa_package        = 'python-software-properties'
-        }
-        'trusty', 'utopic', 'vivid': {
-          $ppa_options        = '-y'
-          $ppa_package        = 'software-properties-common'
-        }
-        default: {
-          $ppa_options        = '-y'
-          $ppa_package        = 'software-properties-common'
-        }
-      }
+      $ppa_options = undef
+      $ppa_package = undef
+      $backports   = undef
+      $auth_conf_owner = 'root'
     }
   }
 }