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

3 files changed, 25 insertions, 13 deletions

diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
index 7ccfce6..39fc306 100644
--- a/manifests/cron/base.pp
+++ b/manifests/cron/base.pp
@@ -1,6 +1,6 @@
 class apt::cron::base {
 
-  package { cron-apt: ensure => installed }
+  package { 'cron-apt': ensure => installed }
 
   case $apt_cron_hours {
     '': {}
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];
   }
 
 }
diff --git a/manifests/cron/download.pp b/manifests/cron/download.pp
index a27967d..4a19fec 100644
--- a/manifests/cron/download.pp
+++ b/manifests/cron/download.pp
@@ -3,19 +3,25 @@ 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":
+
+  file { '/etc/cron-apt/action.d/4-dist-upgrade':
     ensure => absent,
   }
 
-  config_file { "/etc/cron-apt/action.d/3-download":
+  file { '/etc/cron-apt/action.d/3-download':
     content => $action,
-    require => Package[cron-apt]
+    require => Package[cron-apt],
+    owner   => root,
+    group   => 0,
+    mode    => '0644';
   }
 
-  config_file { "/etc/cron-apt/config.d/MAILON":
+  file { '/etc/cron-apt/config.d/MAILON':
     content => "MAILON=changes\n",
-    require => Package[cron-apt]
+    require => Package[cron-apt],
+    owner   => root,
+    group   => 0,
+    mode    => '0644';
   }
 
 }