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
Fix use of $::apt::params::backports and $::apt::params::xfacts.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 5d9baa29edfdc4b47301775fe2c1086d159a6441..48c4f53050e8c8baaac5e3a86c307fbc0a38dc36 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-67,18
+67,18
@@
class apt(
if $proxy['host'] {
apt::setting { 'conf-proxy':
priority => '01',
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'] ? {
}
}
$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
+89,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':