#
class apt(
- $update = {},
- $purge = {},
- $proxy = {},
- $sources = undef,
+ $update = {},
+ $purge = {},
+ $proxy = {},
+ $sources = {},
+ $keys = {},
+ $ppas = {},
+ $settings = {},
) inherits ::apt::params {
-
$frequency_options = ['always','daily','weekly','reluctantly']
validate_hash($update)
if $update['frequency'] {
validate_re($update['frequency'], $frequency_options)
}
- if $update['always'] {
- validate_bool($update['always'])
- }
if $update['timeout'] {
unless is_integer($update['timeout']) {
fail('timeout value for update must be an integer')
$_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',
- 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 $_update['always'] {
+ 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':
notify => Exec['apt_update'],
}
- # Need anchor to provide containment for dependencies.
- anchor { 'apt::update':
- require => Class['apt::update'],
- }
+ anchor { 'apt_first': } -> Class['apt::update'] -> anchor { 'apt_last': }
# 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)
+ }
}