Skip to content
This repository was archived by the owner on Feb 19, 2024. It is now read-only.

Use puppetlabs-apt & require_packages() #18

Open
poolski wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Use puppetlabs-apt & require_packages() #18

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f178d97
Refactoring how apt repos are managed
Jan 4, 2016
15a4aa6
refactored to use require_packages
Jan 4, 2016
662af90
Set correct keyserver
Jan 4, 2016
418bb01
Added apt requirement
Jan 4, 2016
7335828
Rework puppet code to support new GPG endpoints, version bump
ice799 Feb 18, 2016
a45ff25
Make it a major bump just incase
ice799 Feb 18, 2016
46ae3bc
Merge pull request #21 from computology/gpg_update
ice799 Feb 18, 2016
34d65c2
Fix quotes in names
petems Feb 24, 2016
5885c5a
Merge pull request #22 from petems/patch-1
ice799 Feb 24, 2016
c084417
Refactors gem provider into separate defined type
petems Feb 25, 2016
68ab5ac
Updates unit testing setup
petems Feb 25, 2016
e4b2f97
Changes to use top scoped class include
petems Feb 26, 2016
79cc043
Adds spec for defined type
petems Feb 25, 2016
d67cd65
Merge pull request #23 from petems/refactor_gem_repo_into_defined_type
ice799 Apr 8, 2016
930f219
Merge pull request #24 from petems/fix_relative_include
ice799 Apr 8, 2016
3c61461
Refactoring how apt repos are managed
Jan 4, 2016
9bf9203
refactored to use require_packages
Jan 4, 2016
2e6081a
Set correct keyserver
Jan 4, 2016
72496f2
Added apt requirement
Jan 4, 2016
54b06a4
Merge branch 'beta' of github.com:poolski/computology-packagecloud in…
Apr 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,21 @@
repo_name => $repo_name,
}
}
'deb': {
$osname = downcase($::operatingsystem)
case $osname {
'debian', 'ubuntu': {

$component = 'main'
$repo_url = "${base_url}/${repo_name}/${osname}"
$distribution = $::lsbdistcodename

file { $normalized_name:
ensure => file,
path => "/etc/apt/sources.list.d/${normalized_name}.list",
mode => '0644',
content => template('packagecloud/apt.erb'),
} elsif $type == 'deb' {

@stevenrombauts stevenrombauts Sep 28, 2016

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be changed back to 'deb': { because we're in case statement here, not an if/else block. :)

$osname = downcase($::operatingsystem)
case $osname {
'debian', 'ubuntu': {

$component = 'main'
$repo_url = "${base_url}/${repo_name}/${osname}"
$distribution = $::lsbdistcodename

apt::source {"${normalized_name}":

@stevenrombauts stevenrombauts Sep 28, 2016

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The require => File[$normalized_name] line should now also be removed from Exec["apt_key_add_${normalized_name}"] a bit further down, since File[$normalized_name] has now been replaced with an apt::source resource.

location => "${repo_url}",
repos => "${component}",
key => {
'id' => '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
'server' => 'pgp.mit.edu'

@ice799 ice799 Mar 8, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, we can't use pgp.mit.edu. We used to use this in the past, but it goes down very, very often and it breaks most of our user's CI/CD/deploys when that happens.

}

exec { "apt_key_add_${normalized_name}":
Expand Down