Skip to content

Commit

Permalink
Merge pull request voxpupuli#1163 from ekohl/remove-apt-transport-https
Browse files Browse the repository at this point in the history
Compatibility with puppetlabs-apt 4.4.0
  • Loading branch information
wyardley authored Dec 11, 2017
2 parents adc6c7e + 424ef20 commit 8f6e1e1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This module manages NGINX configuration.
### Requirements

* Puppet 4.6.1 or later. Puppet 3 was supported up until release 0.6.0.
* apt is now a soft dependency. If your system uses apt, you'll need to configure an appropriate version of the apt module.
* apt is now a soft dependency. If your system uses apt, you'll need to configure an appropriate version of the apt module. Version 4.4.0 or higher is recommended because of the proper handling of `apt-transport-https`.

### Additional Documentation

Expand Down
5 changes: 1 addition & 4 deletions manifests/package/debian.pp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@

if $manage_repo {
include '::apt'
ensure_packages([ 'apt-transport-https', 'ca-certificates' ])
Package['apt-transport-https','ca-certificates'] -> Exec['apt_update'] -> Package['nginx']
Exec['apt_update'] -> Package['nginx']

case $package_source {
'nginx', 'nginx-stable': {
Expand All @@ -56,8 +55,6 @@
key => {'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7'},
}

Package['apt-transport-https','ca-certificates'] -> Apt::Source['nginx']

package { 'passenger':
ensure => $passenger_package_ensure,
require => Exec['apt_update'],
Expand Down

0 comments on commit 8f6e1e1

Please sign in to comment.