summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorGabriel Filion <lelutin@gmail.com>2012-09-20 02:54:26 -0400
committerGabriel Filion <lelutin@gmail.com>2012-09-20 02:54:26 -0400
commit978378623d250a06441650dd969eb01f90891b64 (patch)
tree84b735933b118e4e7fecbb11fda567e54ec89fc9 /manifests
parent4f433dbd5238e6b5211d3b0f240ff58031c3da2b (diff)
Stop using config_file from the common module
This define doesn't add much of a shortcut and imposes a dependency on the "common" module. We'll be better off with the small repetition but less tightly coupled modules. Sadly, the "common" module is still required, but that is going to be the focus of the commit that follows this one. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
Diffstat (limited to 'manifests')
-rw-r--r--manifests/cron/dist_upgrade.pp17
-rw-r--r--manifests/cron/download.pp19
-rw-r--r--manifests/init.pp3
3 files changed, 21 insertions, 18 deletions
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp
index 1c8adb1..bd29784 100644
--- a/manifests/cron/dist_upgrade.pp
+++ b/manifests/cron/dist_upgrade.pp
@@ -10,14 +10,15 @@ 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":
- content => $action,
- require => Package[cron-apt]
- }
-
- config_file { "/etc/cron-apt/config.d/MAILON":
- content => "MAILON=upgrade\n",
- require => Package[cron-apt]
+ 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];
}
}
diff --git a/manifests/cron/download.pp b/manifests/cron/download.pp
index a27967d..5c2d3f9 100644
--- a/manifests/cron/download.pp
+++ b/manifests/cron/download.pp
@@ -3,19 +3,20 @@ 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":
- content => $action,
- require => Package[cron-apt]
- }
-
- config_file { "/etc/cron-apt/config.d/MAILON":
- content => "MAILON=changes\n",
- require => Package[cron-apt]
+ file {
+ "/etc/cron-apt/action.d/3-download":
+ content => $action,
+ mode => 0644, owner => root, group => 0,
+ require => Package[cron-apt];
+ "/etc/cron-apt/config.d/MAILON":
+ content => "MAILON=changes\n",
+ mode => 0644, owner => root, group => 0,
+ require => Package[cron-apt];
}
}
diff --git a/manifests/init.pp b/manifests/init.pp
index 2ae691f..9ce7330 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -77,7 +77,7 @@ class apt {
$next_codename = debian_nextcodename($codename)
$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":
@@ -85,6 +85,7 @@ class apt {
'' => template( "apt/$operatingsystem/sources.list.erb"),
default => $custom_sources_list
},
+ mode => 0644, owner => root, group => 0,
require => Package['lsb'],
notify => Exec['refresh_apt'],
}