diff --git a/.fixtures.yml b/.fixtures.yml index b7736115..e6a83fc5 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,17 +1,17 @@ fixtures: repositories: stdlib: - repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git" + repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git" ref: "4.15.0" - ruby: "git://github.com/puppetlabs/puppetlabs-ruby.git" - gcc: "git://github.com/puppetlabs/puppetlabs-gcc.git" - pe_gem: "git://github.com/puppetlabs/puppetlabs-pe_gem.git" - make: "git://github.com/voxpupuli/puppet-make.git" - inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git" - vcsrepo: "git://github.com/puppetlabs/puppetlabs-vcsrepo.git" - git: "git://github.com/puppetlabs/puppetlabs-git.git" + ruby: "https://github.com/puppetlabs/puppetlabs-ruby.git" + gcc: "https://github.com/puppetlabs/puppetlabs-gcc.git" + pe_gem: "https://github.com/puppetlabs/puppetlabs-pe_gem.git" + make: "https://github.com/voxpupuli/puppet-make.git" + inifile: "https://github.com/puppetlabs/puppetlabs-inifile.git" + vcsrepo: "https://github.com/puppetlabs/puppetlabs-vcsrepo.git" + git: "https://github.com/puppetlabs/puppetlabs-git.git" portage: - repo: "git://github.com/gentoo/puppet-portage.git" + repo: "https://github.com/gentoo/puppet-portage.git" ref: "2.3.0" symlinks: r10k: "#{source_dir}" diff --git a/manifests/webhook/package.pp b/manifests/webhook/package.pp index e94d6ec5..a7fa39e5 100644 --- a/manifests/webhook/package.pp +++ b/manifests/webhook/package.pp @@ -11,13 +11,6 @@ before => Service['webhook'], } } - if !defined(Package['rack']) { - package { 'rack': - ensure => installed, - provider => $provider, - before => Service['webhook'], - } - } if (! $is_pe_server) { if !defined(Package['webrick']) { package { 'webrick': diff --git a/spec/classes/webhook/package_spec.rb b/spec/classes/webhook/package_spec.rb index 6f29353d..6e22124b 100644 --- a/spec/classes/webhook/package_spec.rb +++ b/spec/classes/webhook/package_spec.rb @@ -24,7 +24,6 @@ provider: 'puppet_gem' ) end - it { is_expected.to contain_package('rack').with(ensure: 'installed') } it { is_expected.not_to contain_package('webrick') } it { is_expected.not_to contain_package('json') } end @@ -40,7 +39,6 @@ it { is_expected.to contain_package('sinatra').with(ensure: 'installed') } it { is_expected.to contain_package('webrick').with(ensure: 'installed') } it { is_expected.to contain_package('json').with(ensure: 'installed') } - it { is_expected.to contain_package('rack').with(ensure: 'installed') } end end end