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-4098) Sync the rest of the files
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 578d73356e5655d8f5374da85dda369da33b8600..5664edeed5220192b10bc1b0974e8ab98f557d78 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-1,11
+1,16
@@
+# == Class: apt
#
#
-class apt(
+# Manage APT (Advanced Packaging Tool)
+#
+class apt (
+ $confs = {},
$update = {},
$purge = {},
$proxy = {},
$sources = {},
$keys = {},
$ppas = {},
$update = {},
$purge = {},
$proxy = {},
$sources = {},
$keys = {},
$ppas = {},
+ $pins = {},
$settings = {},
) inherits ::apt::params {
$settings = {},
) inherits ::apt::params {
@@
-45,6
+50,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'])
}
@@
-59,13
+67,16
@@
class apt(
$_proxy = merge($apt::proxy_defaults, $proxy)
$_proxy = merge($apt::proxy_defaults, $proxy)
+ validate_hash($confs)
validate_hash($sources)
validate_hash($keys)
validate_hash($settings)
validate_hash($ppas)
validate_hash($sources)
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',
content => template('apt/_conf_header.erb', 'apt/proxy.erb'),
}
priority => '01',
content => template('apt/_conf_header.erb', 'apt/proxy.erb'),
}
@@
-133,6
+144,9
@@
class apt(
notify => Class['apt::update'],
}
notify => Class['apt::update'],
}
+ if $confs {
+ create_resources('apt::conf', $confs)
+ }
# manage sources if present
if $sources {
create_resources('apt::source', $sources)
# manage sources if present
if $sources {
create_resources('apt::source', $sources)
@@
-149,4
+163,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)
+ }
}
}