Skip to content

Commit

Permalink
Update passenger rpm gpg key
Browse files Browse the repository at this point in the history
without this change, we see the following error since november 2019:

```
passenger/7/x86_64/
Retrieving key from https://packagecloud.io/phusion/passenger/gpgkey
passenger/7/x86_64/
https://oss-binaries.phusionpassenger.com/yum/passenger/el/7/x86_64/repodata/repomd.xml: [Errno -1] repomd.xml signature could not be verified for passenger
Trying other mirror.
```

Also, since passenger 6.0.5, phusion stopped shipping their own nginx
packages in their repo for CentOS 7.  Instead they rely on the nginx
from epel.
  • Loading branch information
bastelfreak authored and alexjfisher committed Aug 27, 2020
1 parent 361e539 commit de4566a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
end

group :test do
gem 'voxpupuli-test', '>= 1.4.0', :require => false
gem 'voxpupuli-test', '< 2.0.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'rspec-puppet-facts', :require => false, :git => 'https://github.com/mcanevet/rspec-puppet-facts', :ref => '9541292d4fc35db3be1badace673c1108154b571'
Expand Down
7 changes: 6 additions & 1 deletion manifests/package/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,19 @@
}
'passenger': {
if ($facts['os']['name'] in ['RedHat', 'CentOS', 'VirtuozzoLinux']) and ($facts['os']['release']['major'] in ['6', '7']) {
# 2019-11: Passenger changed their gpg key from: `https://packagecloud.io/phusion/passenger/gpgkey`
# to: `https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt`
# Find the latest key by opening: https://oss-binaries.phusionpassenger.com/yum/definitions/el-passenger.repo

# Also note: Since 6.0.5 there are no nginx packages in the phusion EL7 repository, and nginx packages are expected to come from epel instead
yumrepo { 'passenger':
baseurl => "https://oss-binaries.phusionpassenger.com/yum/passenger/el/${facts['os']['release']['major']}/\$basearch",
descr => 'passenger repo',
enabled => '1',
gpgcheck => '0',
repo_gpgcheck => '1',
priority => '1',
gpgkey => 'https://packagecloud.io/phusion/passenger/gpgkey',
gpgkey => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
before => Package['nginx'],
}

Expand Down
7 changes: 6 additions & 1 deletion spec/acceptance/class_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
when 'RedHat'
pkg_cmd = 'yum info nginx | grep "^From repo"'
pkg_remove_cmd = 'yum -y remove nginx nginx-filesystem passenger'
pkg_match = %r{passenger}
pkg_match = case fact('operatingsystemmajrelease')
when '7' # https://blog.phusion.nl/2020/05/29/passenger-6-0-5/
%r{epel}
else
%r{passenger}
end
when 'Debian'
pkg_cmd = 'dpkg -s nginx | grep ^Maintainer'
pkg_remove_cmd = 'apt-get -y purge nginx nginx-common'
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/nginx_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
'baseurl' => "https://oss-binaries.phusionpassenger.com/yum/passenger/el/#{facts[:operatingsystemmajrelease]}/$basearch",
'gpgcheck' => '0',
'repo_gpgcheck' => '1',
'gpgkey' => 'https://packagecloud.io/phusion/passenger/gpgkey'
'gpgkey' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt'
)
end
it do
Expand Down

0 comments on commit de4566a

Please sign in to comment.