#
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 = {},
+ $pins = {},
+ $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'] {
$_purge = merge($::apt::purge_defaults, $purge)
validate_hash($proxy)
+ if $proxy['ensure'] {
+ validate_re($proxy['ensure'], ['file', 'present', 'absent'])
+ }
if $proxy['host'] {
validate_string($proxy['host'])
}
$_proxy = merge($apt::proxy_defaults, $proxy)
- if $proxy['host'] {
+ validate_hash($sources)
+ validate_hash($keys)
+ validate_hash($settings)
+ validate_hash($ppas)
+ validate_hash($pins)
+
+ if $_proxy['ensure'] == 'absent' or $_proxy['host'] {
apt::setting { 'conf-proxy':
+ ensure => $_proxy['ensure'],
priority => '01',
- content => template('apt/_header.erb', 'apt/proxy.erb'),
+ content => template('apt/_conf_header.erb', 'apt/proxy.erb'),
}
}
$sources_list_content = $_purge['sources.list'] ? {
- false => undef,
- true => "# Repos managed by puppet.\n",
+ true => "# Repos managed by puppet.\n",
+ default => undef,
}
$preferences_ensure = $_purge['preferences'] ? {
- false => file,
- true => absent,
+ true => absent,
+ default => file,
}
- if $always_apt_update == true {
+ if $_update['frequency'] == 'always' {
Exec <| title=='apt_update' |> {
refreshonly => false,
}
apt::setting { 'conf-update-stamp':
priority => 15,
- content => template('apt/_header.erb', 'apt/15update-stamp.erb'),
+ content => template('apt/_conf_header.erb', 'apt/15update-stamp.erb'),
}
file { 'sources.list':
group => root,
mode => '0644',
content => $sources_list_content,
- notify => Exec['apt_update'],
+ notify => Class['apt::update'],
}
file { 'sources.list.d':
mode => '0644',
purge => $_purge['sources.list.d'],
recurse => $_purge['sources.list.d'],
- notify => Exec['apt_update'],
+ notify => Class['apt::update'],
}
file { 'preferences':
owner => root,
group => root,
mode => '0644',
- notify => Exec['apt_update'],
+ notify => Class['apt::update'],
}
file { 'preferences.d':
mode => '0644',
purge => $_purge['preferences.d'],
recurse => $_purge['preferences.d'],
- notify => Exec['apt_update'],
- }
-
- # Need anchor to provide containment for dependencies.
- anchor { 'apt::update':
- require => Class['apt::update'],
+ notify => Class['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)
+ }
+
+ # manage pins if present
+ if $pins {
+ create_resources('apt::pin', $pins)
+ }
}