CHANGELOG

@@ -1,12 +1,15 @@
+2.4.4 - Eli Young & Igor Galić
+  * prevent potential leakage Resource defaults for ini
+  *     Handle branch names containing slashes
 2.4.3 - Zack Smith
   * Documentation Updates
 2.4.1 - Zack Smith
   * Documentation Updates
 2.4.0 - Zack Smith
   * Bump r10k version
-2.3.3 - Eli Young
+2.3.4 - Eli Young
   * Webhook fixes for reboots + refreshes
-2.3.2 - Zach Leslie + misterdom
+2.3.3 - Zach Leslie + misterdom
   * Fix for #97
 2.3.2 - Zach Leslie + misterdom
   * Fix for #96

Modulefile

@@ -1,5 +1,5 @@
 name    'zack-r10k'
-version '2.4.3'
+version '2.4.4'
 source 'https://github.com/acidprime/r10k'
 author 'zack'
 license 'Apache License, Version 2.0'

README.md

@@ -42,7 +42,7 @@ class { 'r10k':
 
 | Module Version | r10k Version |
 | -------------- | ------------ |
-| v2.4.+         | 1.3.5        |
+| v2.4.x         | 1.3.5        |
 | v2.3.1         | 1.3.4        |
 | v2.3.0         | 1.3.2        |
 | v2.2.8         | 1.3.1        |
@@ -288,7 +288,6 @@ file {'/usr/local/bin/prefix_command.rb':
 class {'r10k::webhook::config':
   prefix         => true,
   prefix_command => '/usr/local/bin/prefix_command.rb',
-  notify         => Service['webhook'],
   require        => File['/usr/local/bin/prefix_command.rb'],
 }
 
@@ -317,7 +316,6 @@ The `git_webhook` type will using the [api token](https://help.github.com/articl
 class {'r10k::webhook::config':
   enable_ssl     => false,
   protected      => false,
-  notify         => Service['webhook'],
 }
 
 class {'r10k::webhook':

files/webhook

@@ -81,7 +81,7 @@ class Server  < Sinatra::Base
     data = JSON.parse(decoded, :quirks_mode => true)
 
     # github sends a 'ref', stash sends an array in 'refChanges'
-    branch = ( data['ref'] || data['refChanges'][0]['refId'] ).split("/").last
+    branch = ( data['ref'] || data['refChanges'][0]['refId'] ).sub('refs/heads/', '')
 
     # If prefix is enabled in our config file run the command to determine the prefix
     if $config['prefix']

manifests/postrun_command.pp

@@ -7,13 +7,10 @@
   validate_re($ensure, [ '^present', '^absent' ],
   'ensure must be either present or absent')
 
-  Ini_setting {
-    path    => "${r10k::params::puppetconf_path}/puppet.conf",
+  ini_setting { 'r10k_postrun_command':
     ensure  => $ensure,
+    path    => "${r10k::params::puppetconf_path}/puppet.conf",
     section => 'agent',
-  }
-
-  ini_setting { 'r10k_postrun_command':
     setting => 'postrun_command',
     value   => $command,
   }

manifests/prerun_command.pp

@@ -7,13 +7,10 @@
   validate_re($ensure, [ '^present', '^absent' ],
   'ensure must be either present or absent')
 
-  Ini_setting {
-    path    => "${r10k::params::puppetconf_path}/puppet.conf",
+  ini_setting { 'r10k_prerun_command':
     ensure  => $ensure,
+    path    => "${r10k::params::puppetconf_path}/puppet.conf",
     section => 'agent',
-  }
-
-  ini_setting { 'r10k_prerun_command':
     setting => 'prerun_command',
     value   => $command,
   }