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-3307) - Auto update expired keys
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
update.pp
diff --git
a/manifests/update.pp
b/manifests/update.pp
index 44f6c6e301ca37f4d48ca4357a2301928db5cc79..1ea16afe039eb815c79a4fba87807d39d25e0f8f 100644
(file)
--- a/
manifests/update.pp
+++ b/
manifests/update.pp
@@
-1,3
+1,7
@@
+# @summary Updates the list of available packages using apt-get update.
+#
+# @api private
+#
class apt::update {
assert_private()
class apt::update {
assert_private()
@@
-13,7
+17,7
@@
class apt::update {
'daily': {
#compare current date with the apt_update_last_success fact to determine
#if we should kick apt_update.
'daily': {
#compare current date with the apt_update_last_success fact to determine
#if we should kick apt_update.
- $daily_threshold = (
strftime('%s'
) - 86400)
+ $daily_threshold = (
Integer(Timestamp().strftime('%s')
) - 86400)
if $::apt_update_last_success {
if $::apt_update_last_success + 0 < $daily_threshold {
$_kick_apt = true
if $::apt_update_last_success {
if $::apt_update_last_success + 0 < $daily_threshold {
$_kick_apt = true
@@
-28,7
+32,7
@@
class apt::update {
'weekly':{
#compare current date with the apt_update_last_success fact to determine
#if we should kick apt_update.
'weekly':{
#compare current date with the apt_update_last_success fact to determine
#if we should kick apt_update.
- $weekly_threshold = (
strftime('%s'
) - 604800)
+ $weekly_threshold = (
Integer(Timestamp().strftime('%s')
) - 604800)
if $::apt_update_last_success {
if ( $::apt_update_last_success + 0 < $weekly_threshold ) {
$_kick_apt = true
if $::apt_update_last_success {
if ( $::apt_update_last_success + 0 < $weekly_threshold ) {
$_kick_apt = true
@@
-54,6
+58,7
@@
class apt::update {
}
exec { 'apt_update':
command => "${::apt::provider} update",
}
exec { 'apt_update':
command => "${::apt::provider} update",
+ loglevel => $::apt::_update['loglevel'],
logoutput => 'on_failure',
refreshonly => $_refresh,
timeout => $::apt::_update['timeout'],
logoutput => 'on_failure',
refreshonly => $_refresh,
timeout => $::apt::_update['timeout'],