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
MODULES-2446 - Fix pinning for backports
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 453df3171f3e0191cf4ff9018229a6297f85582e..b9087cfb7abae68714edd30ab66c2c28df5216d5 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-26,7
+26,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'] {
@@
-45,6
+45,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'])
}
@@
-64,21
+67,22
@@
class apt(
validate_hash($settings)
validate_hash($ppas)
validate_hash($settings)
validate_hash($ppas)
- 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['frequency'] == 'always' {
}
if $_update['frequency'] == 'always' {
@@
-89,7
+93,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':
@@
-99,7
+103,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':
@@
-110,7
+114,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':
@@
-119,7
+123,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':
@@
-130,12
+134,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