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 #279 from apenney/fix-spacing
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 12db61a6df3b1c9080584436a02cc490e86e82a7..85055c8119101b66b14566201816d749829995cd 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-14,6
+14,9
@@
# to true, Puppet will purge all unmanaged entries from sources.list.d
# update_timeout - Overrides the exec timeout in seconds for apt-get update.
# If not set defaults to Exec's default (300)
# to true, Puppet will purge all unmanaged entries from sources.list.d
# update_timeout - Overrides the exec timeout in seconds for apt-get update.
# If not set defaults to Exec's default (300)
+# update_tries - Number of times that `apt-get update` will be tried. Use this
+# to work around transient DNS and HTTP errors. By default, the command
+# will only be run once.
#
# Actions:
#
#
# Actions:
#
@@
-31,9
+34,15
@@
class apt(
$purge_sources_list_d = false,
$purge_preferences = false,
$purge_preferences_d = false,
$purge_sources_list_d = false,
$purge_preferences = false,
$purge_preferences_d = false,
- $update_timeout = undef
+ $update_timeout = undef,
+ $update_tries = undef,
+ $sources = undef
) {
) {
+ if $::osfamily != 'Debian' {
+ fail('This module only works on Debian or derivatives like Ubuntu')
+ }
+
include apt::params
include apt::update
include apt::params
include apt::update
@@
-128,12
+137,21
@@
Package: bogus-package\n",
file { 'configure-apt-proxy':
ensure => $proxy_set,
path => "${apt_conf_d}/proxy",
file { 'configure-apt-proxy':
ensure => $proxy_set,
path => "${apt_conf_d}/proxy",
- content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
+ content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";
\n
",
notify => Exec['apt_update'],
notify => Exec['apt_update'],
+ mode => '0644',
+ owner => root,
+ group => root,
}
# Need anchor to provide containment for dependencies.
anchor { 'apt::update':
require => Class['apt::update'],
}
}
# Need anchor to provide containment for dependencies.
anchor { 'apt::update':
require => Class['apt::update'],
}
+
+ # manage sources if present
+ if $sources != undef {
+ validate_hash($sources)
+ create_resources('apt::source', $sources)
+ }
}
}