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

Apply code style corrections from puppet-lint

Browse source 
Signed-off-by: Gabriel Filion <lelutin@gmail.com>

+ more linting by intrigeri.

Conflicts:
	manifests/apticron.pp
	manifests/cron/dist_upgrade.pp
	manifests/cron/download.pp
	manifests/dist_upgrade/initiator.pp
	manifests/init.pp
	manifests/listchanges.pp
	manifests/preferences.pp
	manifests/preseeded_package.pp
	manifests/proxy_client.pp
	manifests/unattended_upgrades.pp
	manifests/update.pp
This commit is contained in:
Gabriel Filion 2013-01-02 08:12:11 -05:00 committed by intrigeri
parent 17f67d9fac
commit ded81d8edc
21 changed files with 173 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifests/apt_conf.pp
View file

@ -19,8 +19,10 @@ define apt::apt_conf(
# apparently doesn't. # apparently doesn't.
file { "/etc/apt/apt.conf.d/${name}": file { "/etc/apt/apt.conf.d/${name}":
ensure => $ensure, ensure => $ensure,
owner => root, group => 0, mode => 0644, owner => root,
notify => Exec["refresh_apt"], group => 0,
mode => '0644',
notify => Exec['refresh_apt'],
} }
if $source { if $source {

10
manifests/apticron.pp
View file

@ -12,11 +12,13 @@ class apt::apticron(
$customsubject = '' $customsubject = ''
) { ) {
package { apticron: ensure => $ensure_version } package { 'apticron': ensure => $ensure_version }
file { "/etc/apticron/apticron.conf": file { '/etc/apticron/apticron.conf':
content => template($apt::apticron::config), content => template($apt::apticron::config),
mode => 0644, owner => root, group => root, owner => root,
require => Package["apticron"]; group => root,
mode => '0644',
require => Package['apticron'];
} }
} }

2
manifests/cron/base.pp
View file

@ -1,6 +1,6 @@
class apt::cron::base { class apt::cron::base {
package { cron-apt: ensure => installed } package { 'cron-apt': ensure => installed }
case $apt_cron_hours { case $apt_cron_hours {
'': {} '': {}

22
manifests/cron/dist_upgrade.pp
View file

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

14
manifests/cron/download.pp
View file

@ -4,20 +4,24 @@ class apt::cron::download inherits apt::cron::base {
dist-upgrade -d -y -o APT::Get::Show-Upgraded=true 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, ensure => absent,
} }
file { "/etc/cron-apt/action.d/3-download": file { '/etc/cron-apt/action.d/3-download':
content => $action, content => $action,
require => Package[cron-apt], require => Package[cron-apt],
owner => root, group => 0, mode => 0644; owner => root,
group => 0,
mode => '0644';
} }
file { "/etc/cron-apt/config.d/MAILON": file { '/etc/cron-apt/config.d/MAILON':
content => "MAILON=changes\n", content => "MAILON=changes\n",
require => Package[cron-apt], require => Package[cron-apt],
owner => root, group => 0, mode => 0644; owner => root,
group => 0,
mode => '0644';
} }
} }

12
manifests/dist_upgrade.pp
View file

@ -4,13 +4,15 @@ class apt::dist_upgrade {
include apt::update include apt::update
} }
$req = $apt::disable_update ? {
true => undef,
default => Exec['apt_updated'],
}
exec { 'apt_dist-upgrade': exec { 'apt_dist-upgrade':
command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade", command => '/usr/bin/apt-get -q -y -o \'DPkg::Options::=--force-confold\' dist-upgrade',
refreshonly => true, refreshonly => true,
require => $apt::disable_update ? { require => $req
true => undef,
default => Exec['apt_updated'],
}
} }
} }

10
manifests/dist_upgrade/initiator.pp
View file

@ -4,15 +4,15 @@ class apt::dist_upgrade::initiator inherits apt::dist_upgrade {
$initiator_abs = "${apt::apt_base_dir}/${initiator}" $initiator_abs = "${apt::apt_base_dir}/${initiator}"
file { 'apt_upgrade_initiator': file { 'apt_upgrade_initiator':
mode => 0644, mode => '0644',
owner => root, owner => root,
group => 0, group => 0,
path => "${initiator_abs}", path => $initiator_abs,
checksum => md5, checksum => md5,
source => [ source => [
"puppet:///modules/site_apt/${::fqdn}/${initiator}", "puppet:///modules/site_apt/${::fqdn}/${initiator}",
"puppet:///modules/site_apt/${initiator}", "puppet:///modules/site_apt/${initiator}",
"puppet:///modules/apt/${initiator}", "puppet:///modules/apt/${initiator}",
], ],
} }

14
manifests/dot_d_directories.pp
View file

@ -2,20 +2,20 @@ class apt::dot_d_directories {
# watch .d directories and ensure they are present # watch .d directories and ensure they are present
file { file {
"/etc/apt/apt.conf.d": '/etc/apt/apt.conf.d':
ensure => directory, ensure => directory,
checksum => mtime, checksum => mtime,
notify => Exec['refresh_apt']; notify => Exec['refresh_apt'];
"/etc/apt/sources.list.d": '/etc/apt/sources.list.d':
ensure => directory, ensure => directory,
checksum => mtime, checksum => mtime,
notify => Exec['refresh_apt']; notify => Exec['refresh_apt'];
} }
exec { exec {
# "&& sleep 1" is workaround for older(?) clients # "&& sleep 1" is workaround for older(?) clients
'refresh_apt': 'refresh_apt':
command => '/usr/bin/apt-get update && sleep 1', command => '/usr/bin/apt-get update && sleep 1',
refreshonly => true, refreshonly => true,
} }

8
manifests/dselect.pp
View file

@ -1,10 +1,10 @@
class apt::dselect { class apt::dselect {
# suppress annoying help texts of dselect # suppress annoying help texts of dselect
line { dselect_expert: line { 'dselect_expert':
file => "/etc/dpkg/dselect.cfg", file => '/etc/dpkg/dselect.cfg',
line => "expert", line => 'expert',
} }
package { dselect: ensure => installed } package { 'dselect': ensure => installed }
} }

75
manifests/init.pp
View file

@ -20,7 +20,7 @@ class apt(
case $::operatingsystem { case $::operatingsystem {
'debian': { 'debian': {
$real_repos = $repos ? { $real_repos = $repos ? {
'auto' => 'main contrib non-free', 'auto' => 'main contrib non-free',
default => $repos, default => $repos,
} }
} }
@ -32,8 +32,8 @@ class apt(
} }
} }
package { apt: package { 'apt':
ensure => installed, ensure => installed,
require => undef, require => undef,
} }
@ -42,7 +42,7 @@ class apt(
# init $release, $next_release, $next_codename, $release_version # init $release, $next_release, $next_codename, $release_version
case $codename { case $codename {
'n/a': { 'n/a': {
fail("Unknown lsbdistcodename reported by facter: '$lsbdistcodename', please fix this by setting this variable in your manifest.") fail("Unknown lsbdistcodename reported by facter: '$::lsbdistcodename', please fix this by setting this variable in your manifest.")
} }
default: { default: {
$release = debian_release($codename) $release = debian_release($codename)
@ -52,41 +52,44 @@ class apt(
$next_codename = debian_nextcodename($codename) $next_codename = debian_nextcodename($codename)
$next_release = debian_nextrelease($release) $next_release = debian_nextrelease($release)
$sources_content = $::custom_sources_list ? {
'' => template( "apt/${::operatingsystem}/sources.list.erb"),
default => $::custom_sources_list
}
file { file {
# include main, security and backports # include main, security and backports
# additional sources should be included via the apt::sources_list define # additional sources should be included via the apt::sources_list define
"/etc/apt/sources.list": '/etc/apt/sources.list':
content => $custom_sources_list ? { content => $sources_content,
'' => template( "apt/${::operatingsystem}/sources.list.erb"),
default => $custom_sources_list
},
require => Package['lsb'], require => Package['lsb'],
notify => Exec['refresh_apt'], notify => Exec['refresh_apt'],
owner => root, group => 0, mode => 0644; owner => root,
group => 0,
mode => '0644';
} }
apt_conf { "02show_upgraded": apt_conf { '02show_upgraded':
source => [ "puppet:///modules/site_apt/${::fqdn}/02show_upgraded", source => [ "puppet:///modules/site_apt/${::fqdn}/02show_upgraded",
"puppet:///modules/site_apt/02show_upgraded", 'puppet:///modules/site_apt/02show_upgraded',
"puppet:///modules/apt/02show_upgraded" ] 'puppet:///modules/apt/02show_upgraded' ]
} }
if ( $::virtual == "vserver" ) { if ( $::virtual == 'vserver' ) {
apt_conf { "03clean_vserver": apt_conf { '03clean_vserver':
source => [ "puppet:///modules/site_apt/${::fqdn}/03clean_vserver", source => [ "puppet:///modules/site_apt/${::fqdn}/03clean_vserver",
"puppet:///modules/site_apt/03clean_vserver", 'puppet:///modules/site_apt/03clean_vserver',
"puppet:///modules/apt/03clean_vserver" ], 'puppet:///modules/apt/03clean_vserver' ],
alias => "03clean"; alias => '03clean';
} }
} }
else { else {
apt_conf { "03clean": apt_conf { '03clean':
source => [ "puppet:///modules/site_apt/${::fqdn}/03clean", source => [ "puppet:///modules/site_apt/${::fqdn}/03clean",
"puppet:///modules/site_apt/03clean", 'puppet:///modules/site_apt/03clean',
"puppet:///modules/apt/03clean" ] 'puppet:///modules/apt/03clean' ]
} }
} }
case $custom_preferences { case $custom_preferences {
false: { false: {
include apt::preferences::absent include apt::preferences::absent
@ -101,29 +104,35 @@ class apt(
include apt::dot_d_directories include apt::dot_d_directories
## This package should really always be current ## This package should really always be current
package { "debian-archive-keyring": ensure => latest } package { 'debian-archive-keyring': ensure => latest }
# backports uses the normal archive key now # backports uses the normal archive key now
package { "debian-backports-keyring": ensure => absent } package { 'debian-backports-keyring': ensure => absent }
if $custom_key_dir { include common::moduledir
$apt_base_dir = "${common::moduledir::module_dir_path}/apt"
modules_dir { 'apt': }
if $::custom_key_dir {
file { "${apt_base_dir}/keys.d": file { "${apt_base_dir}/keys.d":
source => "$custom_key_dir", source => $::custom_key_dir,
recurse => true, recurse => true,
mode => 0755, owner => root, group => root, owner => root,
group => root,
mode => '0755',
} }
exec { "custom_keys": exec { 'custom_keys':
command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && /usr/bin/apt-get update", command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && /usr/bin/apt-get update",
subscribe => File["${apt_base_dir}/keys.d"], subscribe => File["${apt_base_dir}/keys.d"],
refreshonly => true, refreshonly => true,
} }
if $custom_preferences != false { if $custom_preferences != false {
Exec["custom_keys"] { Exec['custom_keys'] {
before => File['apt_config'], before => File['apt_config'],
} }
} }
} }
# workaround for preseeded_package component # workaround for preseeded_package component
file { [ "/var/cache", "/var/cache/local", "/var/cache/local/preseeding" ]: ensure => directory } file { [ '/var/cache', '/var/cache/local', '/var/cache/local/preseeding' ]: ensure => directory }
} }

12
manifests/listchanges.pp
View file

@ -7,11 +7,13 @@ class apt::listchanges(
$saveseen = '/var/lib/apt/listchanges.db', $saveseen = '/var/lib/apt/listchanges.db',
$which = 'both' $which = 'both'
){ ){
package { apt-listchanges: ensure => $ensure_version } package { 'apt-listchanges': ensure => $ensure_version }
file { "/etc/apt/listchanges.conf": file { '/etc/apt/listchanges.conf':
content => template($apt::listchanges::config), content => template($apt::listchanges::config),
mode => 0644, owner => root, group => root, owner => root,
require => Package["apt-listchanges"]; group => root,
mode => '0644',
require => Package['apt-listchanges'];
} }
} }

14
manifests/preferences.pp
View file

@ -1,20 +1,20 @@
class apt::preferences { class apt::preferences {
$pref_contents = $custom_preferences ? { $pref_contents = $apt::custom_preferences ? {
'' => $operatingsystem ? { '' => $::operatingsystem ? {
'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"), 'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"), 'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
}, },
default => $custom_preferences default => $apt::custom_preferences
} }
file { '/etc/apt/preferences': file { '/etc/apt/preferences':
ensure => present, ensure => present,
alias => 'apt_config', alias => 'apt_config',
# only update together # only update together
content => $pref_contents, content => $pref_contents,
require => File["/etc/apt/sources.list"], require => File['/etc/apt/sources.list'],
owner => root, group => 0, mode => 0644; owner => root, group => 0, mode => '0644';
} }
} }

2
manifests/preferences/absent.pp
View file

@ -1,7 +1,7 @@
class apt::preferences::absent { class apt::preferences::absent {
file { '/etc/apt/preferences': file { '/etc/apt/preferences':
alias => 'apt_config',
ensure => absent, ensure => absent,
alias => 'apt_config',
} }
} }

20
manifests/preferences_snippet.pp
View file

@ -1,11 +1,11 @@
define apt::preferences_snippet( define apt::preferences_snippet (
$priority,
$package = false, $package = false,
$ensure = 'present', $ensure = 'present',
$source = '', $source = '',
$release = '', $release = '',
$pin = '', $pin = ''
$priority ) ) {
{
$real_package = $package ? { $real_package = $package ? {
false => $name, false => $name,
@ -13,19 +13,19 @@ define apt::preferences_snippet(
} }
if $custom_preferences == false { if $custom_preferences == false {
fail("Trying to define a preferences_snippet with \$custom_preferences set to false.") fail('Trying to define a preferences_snippet with $custom_preferences set to false.')
} }
if !$pin and !$release { if !$pin and !$release {
fail("apt::preferences_snippet requires one of the 'pin' or 'release' argument to be set") fail('apt::preferences_snippet requires one of the \'pin\' or \'release\' argument to be set')
} }
if $pin and $release { if $pin and $release {
fail("apt::preferences_snippet requires either a 'pin' or 'release' argument, not both") fail('apt::preferences_snippet requires either a \'pin\' or \'release\' argument, not both')
} }
file { "/etc/apt/preferences.d/${name}": file { "/etc/apt/preferences.d/${name}":
ensure => $ensure, ensure => $ensure,
owner => root, group => 0, mode => 0644; owner => root, group => 0, mode => '0644';
} }
# This should really work in the same manner as sources_list and apt_conf # This should really work in the same manner as sources_list and apt_conf
@ -36,12 +36,12 @@ define apt::preferences_snippet(
case $release { case $release {
'': { '': {
File["/etc/apt/preferences.d/${name}"]{ File["/etc/apt/preferences.d/${name}"]{
content => template("apt/preferences_snippet.erb") content => template('apt/preferences_snippet.erb')
} }
} }
default: { default: {
File["/etc/apt/preferences.d/${name}"]{ File["/etc/apt/preferences.d/${name}"]{
content => template("apt/preferences_snippet_release.erb") content => template('apt/preferences_snippet_release.erb')
} }
} }
} }

26
manifests/preseeded_package.pp
View file

@ -1,17 +1,21 @@
define apt::preseeded_package ($content = "", $ensure = "installed") { define apt::preseeded_package (
$ensure = 'installed',
$content = ''
) {
$seedfile = "/var/cache/local/preseeding/${name}.seeds" $seedfile = "/var/cache/local/preseeding/${name}.seeds"
$real_content = $content ? {
'' => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ),
default => $content
}
file { $seedfile: file { $seedfile:
content => $content ? { content => $real_content,
"" => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ), mode => '0600', owner => root, group => root,
default => $content }
},
mode => 0600, owner => root, group => root,
}
package { $name: package { $name:
ensure => $ensure, ensure => $ensure,
responsefile => $seedfile, responsefile => $seedfile,
require => File[$seedfile], require => File[$seedfile],
} }
} }

4
manifests/proxy_client.pp
View file

@ -3,7 +3,7 @@ class apt::proxy_client(
$port = '3142', $port = '3142',
){ ){
apt_conf { "20proxy": apt_conf { '20proxy':
content => template("apt/20proxy.erb"), content => template('apt/20proxy.erb'),
} }
} }

2
manifests/reboot_required_notify.pp
View file

@ -3,7 +3,7 @@ class apt::reboot_required_notify {
# This package installs the script that created /var/run/reboot-required*. # This package installs the script that created /var/run/reboot-required*.
# This script (/usr/share/update-notifier/notify-reboot-required) is # This script (/usr/share/update-notifier/notify-reboot-required) is
# triggered e.g. by kernel packages. # triggered e.g. by kernel packages.
package { update-notifier-common: package { 'update-notifier-common':
ensure => installed, ensure => installed,
} }

6
manifests/sources_list.pp
View file

@ -1,8 +1,8 @@
define apt::sources_list ( define apt::sources_list (
$ensure = 'present', $ensure = 'present',
$source = '', $source = '',
$content = undef ) $content = undef
{ ) {
if $source == '' and $content == undef { if $source == '' and $content == undef {
fail("One of \$source or \$content must be specified for apt_sources_snippet ${name}") fail("One of \$source or \$content must be specified for apt_sources_snippet ${name}")
@ -18,7 +18,7 @@ define apt::sources_list (
# apparently doesn't. # apparently doesn't.
file { "/etc/apt/sources.list.d/${name}": file { "/etc/apt/sources.list.d/${name}":
ensure => $ensure, ensure => $ensure,
owner => root, group => 0, mode => 0644, owner => root, group => 0, mode => '0644',
notify => Exec['refresh_apt'], notify => Exec['refresh_apt'],
} }

16
manifests/unattended_upgrades.pp
View file

@ -1,21 +1,21 @@
class apt::unattended_upgrades { class apt::unattended_upgrades {
package { 'unattended-upgrades': package { 'unattended-upgrades':
ensure => present, ensure => present,
require => undef, require => undef,
} }
apt_conf { "50unattended-upgrades": apt_conf { '50unattended-upgrades':
source => [ source => [
"puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades", "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
"puppet:///modules/site_apt/50unattended-upgrades", 'puppet:///modules/site_apt/50unattended-upgrades',
"puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ], "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ],
require => Package['unattended-upgrades'], require => Package['unattended-upgrades'],
} }
if $custom_preferences != false { if $apt::custom_preferences != false {
Apt_conf["50unattended-upgrades"] { Apt_conf['50unattended-upgrades'] {
before => Concat[apt_config], before => Concat['apt_config'],
} }
} }
} }

7
manifests/update.pp
View file

@ -2,11 +2,12 @@ class apt::update {
exec { 'update_apt': exec { 'update_apt':
command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean', command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
require => [ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ], require => [
File['/etc/apt/sources.list'] ], File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
File['/etc/apt/sources.list'] ],
loglevel => info, loglevel => info,
# Another Semaphor for all packages to reference # Another Semaphor for all packages to reference
alias => "apt_updated" alias => 'apt_updated'
} }
} }

28
manifests/upgrade_package.pp
View file

@ -1,7 +1,9 @@
define apt::upgrade_package ($version = "") { define apt::upgrade_package (
$version = ''
) {
if $apt::disable_update == false { if $apt::disable_update == false {
include apt::update include apt::update
} }
$version_suffix = $version ? { $version_suffix = $version ? {
@ -12,25 +14,29 @@ define apt::upgrade_package ($version = "") {
if !defined(Package['apt-show-versions']) { if !defined(Package['apt-show-versions']) {
package { 'apt-show-versions': package { 'apt-show-versions':
ensure => installed, ensure => installed,
require => undef, require => undef,
} }
} }
if !defined(Package['dctrl-tools']) { if !defined(Package['dctrl-tools']) {
package { 'dctrl-tools': package { 'dctrl-tools':
ensure => installed, ensure => installed,
require => undef, require => undef,
} }
} }
$req = $apt::disable_update ? {
true => Package['apt-show-versions', 'dctrl-tools'],
default => [
Exec['apt_updated'],
Package['apt-show-versions', 'dctrl-tools']
],
}
exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}": exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}":
onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ], onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
require => $apt::disable_update ? { require => $req
true => Package['apt-show-versions', 'dctrl-tools'],
default => [ Exec['apt_updated'],
Package['apt-show-versions', 'dctrl-tools'] ],
}
} }
} }