Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
710b1c6
)
Fix style errors
author
Erik Dalén
<dalen@spotify.com>
Tue, 21 Aug 2012 20:55:24 +0000
(22:55 +0200)
committer
Erik Dalén
<dalen@spotify.com>
Tue, 21 Aug 2012 20:55:24 +0000
(22:55 +0200)
manifests/backports.pp
patch
|
blob
|
history
manifests/conf.pp
patch
|
blob
|
history
manifests/init.pp
patch
|
blob
|
history
manifests/key.pp
patch
|
blob
|
history
manifests/pin.pp
patch
|
blob
|
history
manifests/ppa.pp
patch
|
blob
|
history
tests/key.pp
patch
|
blob
|
history
diff --git
a/manifests/backports.pp
b/manifests/backports.pp
index aafdf96578dfa35cc599cc0af821fd6ea67d2f30..e9180c48c22a80c69ff699e076ca482a46f621dd 100644
(file)
--- a/
manifests/backports.pp
+++ b/
manifests/backports.pp
@@
-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 {
$release_real = downcase($release)
) inherits apt::params {
$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':
location => $location,
release => "${release_real}-backports",
apt::source { 'backports':
location => $location,
release => "${release_real}-backports",
- repos => $::lsbdistid ? {
- 'debian' => 'main contrib non-free',
- 'ubuntu' => 'main universe multiverse restricted',
- },
- key => $::lsbdistid ? {
- 'debian' => '55BE302B',
- 'ubuntu' => '437D05B5',
- },
+ repos => $repos,
+ key => $key,
key_server => 'pgp.mit.edu',
pin => '200',
}
key_server => 'pgp.mit.edu',
pin => '200',
}
diff --git
a/manifests/conf.pp
b/manifests/conf.pp
index 03aab8e00270fb40ca699d1e4e286a8dd949bb71..3c4cb1975cb3551a1a642f2155111e0932a118e2 100644
(file)
--- a/
manifests/conf.pp
+++ b/
manifests/conf.pp
@@
-1,7
+1,7
@@
define apt::conf (
define apt::conf (
+ $content,
$ensure = present,
$ensure = present,
- $priority = '50',
- $content
+ $priority = '50'
) {
include apt::params
) {
include apt::params
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 3587d21b5b00174c7b4ae3333ea96d01d773c132..442e04c5875262ec0c3564863527f47341db3d5e 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-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'],
}
}
diff --git
a/manifests/key.pp
b/manifests/key.pp
index dbbed2bef0df5e58aea588e1b292d5a1a628359c..98a0f3a32c4b42192f33f6795689b3df939b24ea 100644
(file)
--- a/
manifests/key.pp
+++ b/
manifests/key.pp
@@
-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: {
diff --git
a/manifests/pin.pp
b/manifests/pin.pp
index 14df14b5b3f370c8ec7bc7978f535ceb15e28548..4ef8953aa86ff1026ccda0902cbb3e5e63332253 100644
(file)
--- a/
manifests/pin.pp
+++ b/
manifests/pin.pp
@@
-30,6
+30,6
@@
define apt::pin(
owner => root,
group => root,
mode => '0644',
owner => root,
group => root,
mode => '0644',
- content => template(
"apt/pin.pref.erb"
),
+ content => template(
'apt/pin.pref.erb'
),
}
}
}
}
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index 9527e0d624d3113fa0f72a20d55e5364c3e6a4c2..0458589849e30ec90dcc8f7a7d6f0d73ef6f3c32 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-25,8
+25,10
@@
define apt::ppa(
command => "/usr/bin/add-apt-repository ${name}",
creates => "${sources_list_d}/${sources_list_d_filename}",
logoutput => 'on_failure',
command => "/usr/bin/add-apt-repository ${name}",
creates => "${sources_list_d}/${sources_list_d_filename}",
logoutput => 'on_failure',
- require => [ File[$sources_list_d],
- Package['python-software-properties'] ],
+ require => [
+ File[$sources_list_d],
+ Package['python-software-properties'],
+ ],
notify => Exec['apt_update'],
}
notify => Exec['apt_update'],
}
diff --git
a/tests/key.pp
b/tests/key.pp
index 5c62a4c0d8d80168ec25be51a6c4508c1318c3fc..92679cf6be6e41a04b1bad1d0b820eeac026ce3a 100644
(file)
--- a/
tests/key.pp
+++ b/
tests/key.pp
@@
-1,5
+1,5
@@
# Declare Apt key for apt.puppetlabs.com source
# Declare Apt key for apt.puppetlabs.com source
-apt::key {
"puppetlabs"
:
- key =>
"4BD6EC30"
,
- key_server =>
"pgp.mit.edu"
,
+apt::key {
'puppetlabs'
:
+ key =>
'4BD6EC30'
,
+ key_server =>
'pgp.mit.edu'
,
}
}