Merge branch 'master' of git://labs.riseup.net/shared-apt

Conflicts:
	templates/Ubuntu/sources.list.erb

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];
   }
 
 }