Drop apt::cron::download, and turn $apt_cron_hours into a class parameter for apt::cron::dist_upgrade.

I've introduced apt::cron::download, am not using it anymore, and have
never seen anyone else submit a bug or a merge request for it. Thus,
I feel pretty confident in dropping it.

And this allows me to trivially get rid of the $apt_cron_hours global
variable noticed by LeLutin in #13.
This commit is contained in:
intrigeri 2016-06-29 15:49:22 +00:00
parent a875536532
commit 5102b7863b
4 changed files with 23 additions and 48 deletions

View file

@ -49,6 +49,9 @@ Ubuntu support is lagging behind but not absent either.
## Upgrade Notice<a name="upgrade-notice"></a>
* The `$apt_cron_hours` global variable is deprecated.
Use `apt::cron::dist_upgrade`'s `cron_hours` parameter instead.
* The default value of the `$repos` parameter was removed since the logic is
now in the `apt::params` class. If you have explicitly set `$repos` to
'auto' in your manifests, you should remove this.

View file

@ -1,20 +0,0 @@
class apt::cron::base {
package { 'cron-apt': ensure => installed }
case $apt_cron_hours {
'': {}
default: {
# cron-apt defaults to run every night at 4 o'clock
# so we try not to run at the same time.
cron { 'apt_cron_every_N_hours':
command => 'test -x /usr/sbin/cron-apt && /usr/sbin/cron-apt',
user => root,
hour => "${apt_cron_hours}",
minute => 10,
require => Package['cron-apt'],
}
}
}
}

View file

@ -1,4 +1,23 @@
class apt::cron::dist_upgrade inherits apt::cron::base {
class apt::cron::dist_upgrade (
$cron_hours = '',
) {
package { 'cron-apt': ensure => installed }
case $cron_hours {
'': {}
default: {
# cron-apt defaults to run every night at 4 o'clock
# so we try not to run at the same time.
cron { 'apt_cron_every_N_hours':
command => 'test -x /usr/sbin/cron-apt && /usr/sbin/cron-apt',
user => root,
hour => "${cron_hours}",
minute => 10,
require => Package['cron-apt'],
}
}
}
$action = "autoclean -y
dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'

View file

@ -1,27 +0,0 @@
class apt::cron::download inherits apt::cron::base {
$action = "autoclean -y
dist-upgrade -d -y -o APT::Get::Show-Upgraded=true
"
file { '/etc/cron-apt/action.d/4-dist-upgrade':
ensure => absent,
}
file { '/etc/cron-apt/action.d/3-download':
content => $action,
require => Package[cron-apt],
owner => root,
group => 0,
mode => '0644';
}
file { '/etc/cron-apt/config.d/MAILON':
content => "MAILON=changes\n",
require => Package[cron-apt],
owner => root,
group => 0,
mode => '0644';
}
}