opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Stop using config_file from the common module

Browse source 
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>
This commit is contained in:
Gabriel Filion 2012-09-20 02:54:26 -04:00
parent 4f433dbd52
commit 978378623d
3 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
manifests/cron/dist_upgrade.pp
View file

@ -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":
file {
"/etc/cron-apt/action.d/4-dist-upgrade":
content => $action,
require => Package[cron-apt]
}
config_file { "/etc/cron-apt/config.d/MAILON":
mode => 0644, owner => root, group => 0,
require => Package[cron-apt];
"/etc/cron-apt/config.d/MAILON":
content => "MAILON=upgrade\n",
require => Package[cron-apt]
mode => 0644, owner => root, group => 0,
require => Package[cron-apt];
}
}

13
manifests/cron/download.pp
View file

@ -8,14 +8,15 @@ dist-upgrade -d -y -o APT::Get::Show-Upgraded=true
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]
}
config_file { "/etc/cron-apt/config.d/MAILON":
mode => 0644, owner => root, group => 0,
require => Package[cron-apt];
"/etc/cron-apt/config.d/MAILON":
content => "MAILON=changes\n",
require => Package[cron-apt]
mode => 0644, owner => root, group => 0,
require => Package[cron-apt];
}
}

3
manifests/init.pp
View file

@ -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'],
}