get rid off config_file wrapper

diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp
index 1c8adb1ae3ea9111e3efe6e08eb35f6e6fae1ca3..68460f2b2f06d40d0358f9571dc65bf332e59132 100644 (file)
--- a/manifests/cron/dist_upgrade.pp
+++ b/manifests/cron/dist_upgrade.pp
@@ -10,14 +10,16 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf
 
   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]
+    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=upgrade\n",
-    require => Package[cron-apt]
+    require => Package[cron-apt],
+    owner => root, group => 0, mode => 0644;
   }
 
 }

diff --git a/manifests/cron/download.pp b/manifests/cron/download.pp
index a27967dadba6557e4b345e81a768e1b2eaa6ab3f..a1899951246f4bb58e1bd9166fb9dff7f1195cd9 100644 (file)
--- a/manifests/cron/download.pp
+++ b/manifests/cron/download.pp
@@ -3,19 +3,21 @@ 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":
     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":
     content => "MAILON=changes\n",
-    require => Package[cron-apt]
+    require => Package[cron-apt],
+    owner => root, group => 0, mode => 0644;
   }
 
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index e35dd2c7c2a5d1500753f564825ab5660070c7ba..509b6d16887936b36b846ef52ffb2eaf7ed0e886 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -50,7 +50,7 @@ class apt(
   $next_codename = debian_nextcodename($::lsbdistcodename)
   $next_release = debian_nextrelease($release)
 
-  config_file {
+  file {
     # include main, security and backports
     # additional sources should be included via the apt::sources_list define
     "/etc/apt/sources.list":
@@ -60,6 +60,7 @@ class apt(
       },
       require => Package['lsb'],
       notify => Exec['refresh_apt'],
+      owner => root, group => 0, mode => 0644;
   }
 
   apt_conf { "02show_upgraded":