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
Corrected regression with preference files name
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 578d73356e5655d8f5374da85dda369da33b8600..b9087cfb7abae68714edd30ab66c2c28df5216d5 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-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,8
+67,9
@@
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',
content => template('apt/_conf_header.erb', 'apt/proxy.erb'),
}
priority => '01',
content => template('apt/_conf_header.erb', 'apt/proxy.erb'),
}