diff options
| author | Varac <varac@leap.se> | 2017-06-27 13:57:43 +0200 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2017-06-27 13:57:43 +0200 |
| commit | 3bed48fba6ae35813b8c4413887aba5262c43689 (patch) | |
| tree | 75595f81892da069002af27f361c41ac6381cd96 /manifests/cron/dist_upgrade.pp | |
| parent | 5d001efb65f4ac2afa39d17b7b62d4f861f450a3 (diff) | |
| parent | f3db3309f3a3fc5ee0f621593ed83805798f7890 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/cron/dist_upgrade.pp')
| -rw-r--r-- | manifests/cron/dist_upgrade.pp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp index e1a03ed..db36544 100644 --- a/manifests/cron/dist_upgrade.pp +++ b/manifests/cron/dist_upgrade.pp @@ -2,7 +2,9 @@ class apt::cron::dist_upgrade ( $cron_hours = '', ) { - package { 'cron-apt': ensure => installed } + package { 'cron-apt': + ensure => present; + } case $cron_hours { '': {} @@ -12,7 +14,7 @@ class apt::cron::dist_upgrade ( cron { 'apt_cron_every_N_hours': command => 'test -x /usr/sbin/cron-apt && /usr/sbin/cron-apt', user => root, - hour => "${cron_hours}", + hour => $cron_hours, minute => 10, require => Package['cron-apt'], } @@ -27,14 +29,16 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf ensure => absent, } - package { 'apt-listbugs': ensure => absent } + package { 'apt-listbugs': + ensure => absent; + } file { '/etc/cron-apt/action.d/4-dist-upgrade': content => $action, owner => root, group => 0, mode => '0644', - require => Package[cron-apt]; + require => Package['cron-apt']; } file { '/etc/cron-apt/config.d/MAILON': @@ -42,7 +46,6 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf owner => root, group => 0, mode => '0644', - require => Package[cron-apt]; + require => Package['cron-apt']; } - } |