Merge pull request #496 from puppetlabs/allow-undef-content-conf

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

diff --git a/manifests/init.pp b/manifests/init.pp
index cc4a3308aba82c26959a93329f14f26fe5f3fdc1..140e171c50b008cb8f57d8596cfe77ca8f958476 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,18 +1,32 @@
 #
 class apt(
-  $purge                = {},
-  $proxy                = {},
-  $always_apt_update    = false,
-  $apt_update_frequency = 'reluctantly',
-  $update_timeout       = undef,
-  $update_tries         = undef,
-  $sources              = undef,
+  $update   = {},
+  $purge    = {},
+  $proxy    = {},
+  $sources  = {},
+  $keys     = {},
+  $ppas     = {},
+  $settings = {},
 ) inherits ::apt::params {
 
-  include apt::update
-
   $frequency_options = ['always','daily','weekly','reluctantly']
-  validate_re($apt_update_frequency, $frequency_options)
+  validate_hash($update)
+  if $update['frequency'] {
+    validate_re($update['frequency'], $frequency_options)
+  }
+  if $update['timeout'] {
+    unless is_integer($update['timeout']) {
+      fail('timeout value for update must be an integer')
+    }
+  }
+  if $update['tries'] {
+    unless is_integer($update['tries']) {
+      fail('tries value for update must be an integer')
+    }
+  }
+
+  $_update = merge($::apt::update_defaults, $update)
+  include apt::update
 
   validate_hash($purge)
   if $purge['sources.list'] {
@@ -45,6 +59,11 @@ class apt(
 
   $_proxy = merge($apt::proxy_defaults, $proxy)
 
+  validate_hash($sources)
+  validate_hash($keys)
+  validate_hash($settings)
+  validate_hash($ppas)
+
   if $proxy['host'] {
     apt::setting { 'conf-proxy':
       priority => '01',
@@ -62,7 +81,7 @@ class apt(
     true  => absent,
   }
 
-  if $always_apt_update == true {
+  if $_update['frequency'] == 'always' {
     Exec <| title=='apt_update' |> {
       refreshonly => false,
     }
@@ -114,14 +133,22 @@ class apt(
     notify  => Exec['apt_update'],
   }
 
-  # Need anchor to provide containment for dependencies.
-  anchor { 'apt::update':
-    require => Class['apt::update'],
-  }
+  contain 'apt::update'
 
   # manage sources if present
-  if $sources != undef {
-    validate_hash($sources)
+  if $sources {
     create_resources('apt::source', $sources)
   }
+  # manage keys if present
+  if $keys {
+    create_resources('apt::key', $keys)
+  }
+  # manage ppas if present
+  if $ppas {
+    create_resources('apt::ppa', $ppas)
+  }
+  # manage settings if present
+  if $settings {
+    create_resources('apt::setting', $settings)
+  }
 }