Skip to content

Commit

Permalink
Fix voxpupuli#154 install sinatra on PE & FOSS
Browse files Browse the repository at this point in the history
prior to this commit we moved the sinatra package
to a conditional that only applied to FOSS this broke some PE
installations
  • Loading branch information
Zack Smith committed Apr 20, 2015
1 parent 80a093d commit 46b8a3b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions manifests/webhook.pp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@
hasstatus => false,
}

if !defined(Package['sinatra']) {
package { 'sinatra':
ensure => installed,
provider => 'gem',
before => Service['webhook'],
}
}

if $::is_pe == true or $::is_pe == 'true' {
if versioncmp($::pe_version, '3.7.0') >= 0 {
if !defined(Package['rack']) {
Expand Down Expand Up @@ -85,14 +93,6 @@
}
}

if !defined(Package['sinatra']) {
package { 'sinatra':
ensure => installed,
provider => 'gem',
before => Service['webhook'],
}
}

if versioncmp($::puppetversion, '3.7.0') >= 0 {
if !defined(Package['rack']) {
package { 'rack':
Expand All @@ -103,4 +103,4 @@
}
}
}
}
}

0 comments on commit 46b8a3b

Please sign in to comment.