Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #605 from imphil/master
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index dbf03329586177846ddf5c0bdad09663eefff347..2e82502622126488f41c8f312c6fc247148c6e6c 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-6,6
+6,7
@@
class apt(
$sources = {},
$keys = {},
$ppas = {},
$sources = {},
$keys = {},
$ppas = {},
+ $pins = {},
$settings = {},
) inherits ::apt::params {
$settings = {},
) inherits ::apt::params {
@@
-14,9
+15,6
@@
class apt(
if $update['frequency'] {
validate_re($update['frequency'], $frequency_options)
}
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')
if $update['timeout'] {
unless is_integer($update['timeout']) {
fail('timeout value for update must be an integer')
@@
-29,7
+27,7
@@
class apt(
}
$_update = merge($::apt::update_defaults, $update)
}
$_update = merge($::apt::update_defaults, $update)
- include apt::update
+ include
::
apt::update
validate_hash($purge)
if $purge['sources.list'] {
validate_hash($purge)
if $purge['sources.list'] {
@@
-48,6
+46,9
@@
class apt(
$_purge = merge($::apt::purge_defaults, $purge)
validate_hash($proxy)
$_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'])
}
if $proxy['host'] {
validate_string($proxy['host'])
}
@@
-66,25
+67,27
@@
class apt(
validate_hash($keys)
validate_hash($settings)
validate_hash($ppas)
validate_hash($keys)
validate_hash($settings)
validate_hash($ppas)
+ validate_hash($pins)
- if $proxy['host'] {
+ if $
_proxy['ensure'] == 'absent' or $_
proxy['host'] {
apt::setting { 'conf-proxy':
apt::setting { 'conf-proxy':
+ ensure => $_proxy['ensure'],
priority => '01',
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'] ? {
}
}
$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'] ? {
}
$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,
}
Exec <| title=='apt_update' |> {
refreshonly => false,
}
@@
-92,7
+95,7
@@
class apt(
apt::setting { 'conf-update-stamp':
priority => 15,
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':
}
file { 'sources.list':
@@
-102,7
+105,7
@@
class apt(
group => root,
mode => '0644',
content => $sources_list_content,
group => root,
mode => '0644',
content => $sources_list_content,
- notify =>
Exec['apt_
update'],
+ notify =>
Class['apt::
update'],
}
file { 'sources.list.d':
}
file { 'sources.list.d':
@@
-113,7
+116,7
@@
class apt(
mode => '0644',
purge => $_purge['sources.list.d'],
recurse => $_purge['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':
}
file { 'preferences':
@@
-122,7
+125,7
@@
class apt(
owner => root,
group => root,
mode => '0644',
owner => root,
group => root,
mode => '0644',
- notify =>
Exec['apt_
update'],
+ notify =>
Class['apt::
update'],
}
file { 'preferences.d':
}
file { 'preferences.d':
@@
-133,12
+136,7
@@
class apt(
mode => '0644',
purge => $_purge['preferences.d'],
recurse => $_purge['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
}
# manage sources if present
@@
-157,4
+155,9
@@
class apt(
if $settings {
create_resources('apt::setting', $settings)
}
if $settings {
create_resources('apt::setting', $settings)
}
+
+ # manage pins if present
+ if $pins {
+ create_resources('apt::pin', $pins)
+ }
}
}