diff options
| author | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
| commit | e596bfb9306664ab4aef78bc05615904b7c6e7f2 (patch) | |
| tree | d9759fedf3bdfdb4a4cd3aac1e3747abbeaacbd3 /manifests/cron/dist_upgrade.pp | |
| parent | 08b066db441375d1613d131767cb1c5bdd3bb60b (diff) | |
| parent | d51e2af9d452731f63b2fe16391e9cd2ff9d640f (diff) | |
| download | puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.gz puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.bz2 | |
Merge remote-tracking branch 'remotes/origin/master' into nadir_master
Conflicts:
README
files/50unattended-upgrades
files/lenny/50unattended-upgrades
files/squeeze/50unattended-upgrades
manifests/dist_upgrade.pp
manifests/init.pp
manifests/upgrade_package.pp
Diffstat (limited to 'manifests/cron/dist_upgrade.pp')
| -rw-r--r-- | manifests/cron/dist_upgrade.pp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp index 1c8adb1..74403bb 100644 --- a/manifests/cron/dist_upgrade.pp +++ b/manifests/cron/dist_upgrade.pp @@ -4,20 +4,26 @@ class apt::cron::dist_upgrade inherits apt::cron::base { dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold' " - file { "/etc/cron-apt/action.d/3-download": + file { '/etc/cron-apt/action.d/3-download': ensure => absent, } - package { "apt-listbugs": ensure => absent } + package { 'apt-listbugs': ensure => absent } - config_file { "/etc/cron-apt/action.d/4-dist-upgrade": + file { '/etc/cron-apt/action.d/4-dist-upgrade': content => $action, - require => Package[cron-apt] + owner => root, + group => 0, + mode => '0644', + require => Package[cron-apt]; } - config_file { "/etc/cron-apt/config.d/MAILON": + file { '/etc/cron-apt/config.d/MAILON': content => "MAILON=upgrade\n", - require => Package[cron-apt] + owner => root, + group => 0, + mode => '0644', + require => Package[cron-apt]; } } |