CHANGELOG

@@ -1,3 +1,5 @@
+2.7.3 - esalberg
+ * Regression from 2.7.1
 2.7.2 - Federico Voges & Ben ford
  * Fix #155 gem install issues with arguments
 2.7.1 - Alex Scoble & esalberg & annaken

manifests/webhook.pp

@@ -13,18 +13,18 @@
   }
 
   file { '/var/log/webhook':
-      ensure => 'directory',
-      owner  => $user,
-      group  => $group,
-      recurse => true,
-      before => File['webhook_bin'],
+    ensure   => 'directory',
+    owner    => $user,
+    group    => $group,
+    recurse  => true,
+    before   => File['webhook_bin'],
   }
 
   file { '/var/run/webhook':
-      ensure => 'directory',
-      owner  => $user,
-      group  => $group,
-      before => File['webhook_init_script'],
+    ensure => 'directory',
+    owner  => $user,
+    group  => $group,
+    before => File['webhook_init_script'],
   }
 
   file { 'webhook_init_script':
@@ -47,14 +47,6 @@
     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']) {
@@ -64,6 +56,15 @@
           before   => Service['webhook'],
         }
       }
+
+      if !defined(Package['sinatra']) {
+        package { 'sinatra':
+          ensure   => installed,
+          provider => 'pe_gem',
+          before   => Service['webhook'],
+        }
+      }
+
       # 3.7 does not place the certificate in peadmin's ~
       # This places it there as if it was an upgrade
       file { 'peadmin-cert.pem':
@@ -94,6 +95,14 @@
       }
     }
 
+    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':

metadata.json

@@ -8,7 +8,7 @@
   "source": "https://github.com/acidprime/r10k",
   "summary": "Module for setting up dynamic environments using r10k",
   "tags": ["git", "pe", "environment", "mcollective"],
-  "version": "2.7.2",
+  "version": "2.7.3",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",