diff options
| author | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
| commit | 517040bb2e088325c2baa5bc4e9860d218357669 (patch) | |
| tree | eeca8062bf072c780aafe6f3b6ae22782a8e1914 /manifests/cron/dist_upgrade.pp | |
| parent | cda713fcf6bd189c3e870c9e466aa5f41d1847b6 (diff) | |
| parent | 07a031f2050deecfefa205e1e0c63586692a06ff (diff) | |
| download | puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.gz puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.bz2 | |
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts:
README
manifests/cron/dist_upgrade.pp
manifests/cron/download.pp
manifests/init.pp
manifests/preferences.pp
Diffstat (limited to 'manifests/cron/dist_upgrade.pp')
| -rw-r--r-- | manifests/cron/dist_upgrade.pp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp index bd29784..68460f2 100644 --- a/manifests/cron/dist_upgrade.pp +++ b/manifests/cron/dist_upgrade.pp @@ -10,15 +10,16 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf package { "apt-listbugs": ensure => absent } - file { - "/etc/cron-apt/action.d/4-dist-upgrade": - content => $action, - mode => 0644, owner => root, group => 0, - require => Package[cron-apt]; - "/etc/cron-apt/config.d/MAILON": - content => "MAILON=upgrade\n", - mode => 0644, owner => root, group => 0, - require => Package[cron-apt]; + file { "/etc/cron-apt/action.d/4-dist-upgrade": + content => $action, + require => Package[cron-apt], + owner => root, group => 0, mode => 0644; + } + + file { "/etc/cron-apt/config.d/MAILON": + content => "MAILON=upgrade\n", + require => Package[cron-apt], + owner => root, group => 0, mode => 0644; } } |