Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove soft dependency on treydock/gpg_key #152

Merged
merged 1 commit into from
Dec 2, 2015
Merged

Remove soft dependency on treydock/gpg_key #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ fixtures:
"portage": "git://github.com/gentoo/puppet-portage.git"
"chocolatey": "git://github.com/chocolatey/puppet-chocolatey.git"
"epel": "git://github.com/stahnma/puppet-module-epel.git"
"gpg_key": "git://github.com/treydock/puppet-gpg_key.git"
symlinks:
"nodejs": "#{source_dir}"
4 changes: 0 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,6 @@ This module is not supported on Debian Squeeze.

### Module dependencies

This module uses `treydock-gpg_key` for the import of RPM GPG keys. If using
an operating system of the RedHat-based family, you will need to ensure that
it is installed.

This modules uses `puppetlabs-apt` for the management of the NodeSource
repository. If using an operating system of the Debian-based family, you will
need to ensure that `puppetlabs-apt` version 2.x is installed.
Expand Down
7 changes: 2 additions & 5 deletions manifests/repo/nodesource/yum.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
proxy => $proxy,
proxy_password => $proxy_password,
proxy_username => $proxy_username,
require => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
}

yumrepo { 'nodesource-source':
Expand All @@ -42,6 +43,7 @@
proxy => $proxy,
proxy_password => $proxy_password,
proxy_username => $proxy_username,
require => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
}

file { '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL':
Expand All @@ -51,11 +53,6 @@
owner => 'root',
source => "puppet:///modules/${module_name}/repo/nodesource/NODESOURCE-GPG-SIGNING-KEY-EL",
}

gpg_key{ 'nodesource':
path => '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',
before => [ Yumrepo['nodesource'], Yumrepo['nodesource-source'], ],
}
}

else {
Expand Down