Fix style errors
This commit is contained in:
parent
710b1c6a66
commit
a3d782c3b5
7 changed files with 24 additions and 19 deletions
|
@ -16,7 +16,8 @@
|
||||||
#
|
#
|
||||||
# == Authors
|
# == Authors
|
||||||
#
|
#
|
||||||
# Ben Hughes, I think. At least blame him if this goes wrong. I just added puppet doc.
|
# Ben Hughes, I think. At least blame him if this goes wrong.
|
||||||
|
# I just added puppet doc.
|
||||||
#
|
#
|
||||||
# == Copyright
|
# == Copyright
|
||||||
#
|
#
|
||||||
|
@ -27,18 +28,20 @@ class apt::backports(
|
||||||
) inherits apt::params {
|
) inherits apt::params {
|
||||||
|
|
||||||
$release_real = downcase($release)
|
$release_real = downcase($release)
|
||||||
|
$key = $::lsbdistid ? {
|
||||||
|
'debian' => '55BE302B',
|
||||||
|
'ubuntu' => '437D05B5',
|
||||||
|
}
|
||||||
|
$repos = $::lsbdistid ? {
|
||||||
|
'debian' => 'main contrib non-free',
|
||||||
|
'ubuntu' => 'main universe multiverse restricted',
|
||||||
|
}
|
||||||
|
|
||||||
apt::source { 'backports':
|
apt::source { 'backports':
|
||||||
location => $location,
|
location => $location,
|
||||||
release => "${release_real}-backports",
|
release => "${release_real}-backports",
|
||||||
repos => $::lsbdistid ? {
|
repos => $repos,
|
||||||
'debian' => 'main contrib non-free',
|
key => $key,
|
||||||
'ubuntu' => 'main universe multiverse restricted',
|
|
||||||
},
|
|
||||||
key => $::lsbdistid ? {
|
|
||||||
'debian' => '55BE302B',
|
|
||||||
'ubuntu' => '437D05B5',
|
|
||||||
},
|
|
||||||
key_server => 'pgp.mit.edu',
|
key_server => 'pgp.mit.edu',
|
||||||
pin => '200',
|
pin => '200',
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
define apt::conf (
|
define apt::conf (
|
||||||
|
$content,
|
||||||
$ensure = present,
|
$ensure = present,
|
||||||
$priority = '50',
|
$priority = '50'
|
||||||
$content
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include apt::params
|
include apt::params
|
||||||
|
|
|
@ -108,7 +108,7 @@ class apt(
|
||||||
}
|
}
|
||||||
|
|
||||||
# Need anchor to provide containment for dependencies.
|
# Need anchor to provide containment for dependencies.
|
||||||
anchor { "apt::update":
|
anchor { 'apt::update':
|
||||||
require => Class['apt::update'],
|
require => Class['apt::update'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ define apt::key (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Anchor["apt::key $upkey present"] -> Anchor["apt::key/$title"]
|
Anchor["apt::key ${upkey} present"] -> Anchor["apt::key/${title}"]
|
||||||
|
|
||||||
}
|
}
|
||||||
absent: {
|
absent: {
|
||||||
|
|
|
@ -30,6 +30,6 @@ define apt::pin(
|
||||||
owner => root,
|
owner => root,
|
||||||
group => root,
|
group => root,
|
||||||
mode => '0644',
|
mode => '0644',
|
||||||
content => template("apt/pin.pref.erb"),
|
content => template('apt/pin.pref.erb'),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,8 +25,10 @@ define apt::ppa(
|
||||||
command => "/usr/bin/add-apt-repository ${name}",
|
command => "/usr/bin/add-apt-repository ${name}",
|
||||||
creates => "${sources_list_d}/${sources_list_d_filename}",
|
creates => "${sources_list_d}/${sources_list_d_filename}",
|
||||||
logoutput => 'on_failure',
|
logoutput => 'on_failure',
|
||||||
require => [ File[$sources_list_d],
|
require => [
|
||||||
Package['python-software-properties'] ],
|
File[$sources_list_d],
|
||||||
|
Package['python-software-properties'],
|
||||||
|
],
|
||||||
notify => Exec['apt_update'],
|
notify => Exec['apt_update'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Declare Apt key for apt.puppetlabs.com source
|
# Declare Apt key for apt.puppetlabs.com source
|
||||||
apt::key { "puppetlabs":
|
apt::key { 'puppetlabs':
|
||||||
key => "4BD6EC30",
|
key => '4BD6EC30',
|
||||||
key_server => "pgp.mit.edu",
|
key_server => 'pgp.mit.edu',
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue