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 branch '1.4.x'
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 8f0c87bb5415ade4b11774849f6743889eca3375..12db61a6df3b1c9080584436a02cc490e86e82a7 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-12,6
+12,8
@@
# true, Puppet will purge all unmanaged entries from sources.list
# purge_sources_list_d - Accepts true or false. Defaults to false. If set
# to true, Puppet will purge all unmanaged entries from sources.list.d
# true, Puppet will purge all unmanaged entries from sources.list
# purge_sources_list_d - Accepts true or false. Defaults to false. If set
# 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)
#
# Actions:
#
#
# Actions:
#
@@
-23,23
+25,33
@@
class apt(
$always_apt_update = false,
$disable_keys = undef,
class apt(
$always_apt_update = false,
$disable_keys = undef,
- $proxy_host =
false
,
+ $proxy_host =
undef
,
$proxy_port = '8080',
$purge_sources_list = false,
$purge_sources_list_d = false,
$proxy_port = '8080',
$purge_sources_list = false,
$purge_sources_list_d = false,
- $purge_preferences_d = false
+ $purge_preferences = false,
+ $purge_preferences_d = false,
+ $update_timeout = undef
) {
include apt::params
include apt::update
) {
include apt::params
include apt::update
- validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
+ validate_bool($purge_sources_list, $purge_sources_list_d,
+ $purge_preferences, $purge_preferences_d)
$sources_list_content = $purge_sources_list ? {
false => undef,
true => "# Repos managed by puppet.\n",
}
$sources_list_content = $purge_sources_list ? {
false => undef,
true => "# Repos managed by puppet.\n",
}
+ $preferences_content = $purge_preferences ? {
+ false => undef,
+ true => "Explanation: Preferences managed by Puppet\n
+Explanation: We need a bogus package line because of Debian Bug #732746\n
+Package: bogus-package\n",
+ }
+
if $always_apt_update == true {
Exec <| title=='apt_update' |> {
refreshonly => false,
if $always_apt_update == true {
Exec <| title=='apt_update' |> {
refreshonly => false,
@@
-72,6
+84,15
@@
class apt(
notify => Exec['apt_update'],
}
notify => Exec['apt_update'],
}
+ file { 'apt-preferences':
+ ensure => present,
+ path => "${root}/preferences",
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => $preferences_content,
+ }
+
file { 'preferences.d':
ensure => directory,
path => $preferences_d,
file { 'preferences.d':
ensure => directory,
path => $preferences_d,
@@
-100,7
+121,7
@@
class apt(
}
$proxy_set = $proxy_host ? {
}
$proxy_set = $proxy_host ? {
-
false
=> absent,
+
undef
=> absent,
default => present
}
default => present
}