summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-06-18 11:41:04 -0300
committermh <mh@immerda.ch>2012-06-18 11:41:04 -0300
commitd47addd2ed9ae6e99423bff736352144cda32832 (patch)
treec9ca667f9dc629bb8c4a01f46a4c4ec82a8472a9
parent0e016e968da85a435f1670761bad458aa515c7a5 (diff)
get rid off config_file wrapper
-rw-r--r--manifests/cron/dist_upgrade.pp10
-rw-r--r--manifests/cron/download.pp10
-rw-r--r--manifests/init.pp3
3 files changed, 14 insertions, 9 deletions
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp
index 1c8adb1..68460f2 100644
--- 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 a27967d..a189995 100644
--- 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 e35dd2c..509b6d1 100644
--- 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":