Showing with 7 additions and 5 deletions.

+3 −1 CHANGELOG

+1 −1 Modulefile

+1 −1 manifests/webhook.pp

+2 −2 templates/webhook.init.erb
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,8 +1,10 @@
+2.5.4 -  Zack Smith
+  * Fix webhook init script issue
 2.5.3 -  Eli Young & te206676
   * Ubuntu Support for Webhook #118
   * Permissions on Certificate #119
 2.5.2 -  Chris Roddy
-  * Fixed missing make dep, will be removed in 3.x release of module 
+  * Fixed missing make dep, will be removed in 3.x release of module
 2.5.1 -  Zack Smith
   * README updates
 2.5.0 -  Zack Smith & Sean Keery

diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name    'zack-r10k'
-version '2.5.3'
+version '2.5.4'
 source 'https://github.com/acidprime/r10k'
 author 'zack'
 license 'Apache License, Version 2.0'

diff --git a/manifests/webhook.pp b/manifests/webhook.pp
@@ -3,7 +3,7 @@
   $user  = 'peadmin',
   $group = 'peadmin',
   $git_server = 'localhost',
-) {
+) inherits r10k::params {
 
   File {
     ensure => file,

diff --git a/templates/webhook.init.erb b/templates/webhook.init.erb
@@ -15,15 +15,15 @@ DAEMON_USER='<%= @user %>'
 RETVAL=0
 
 # Source function library.
-. <%= @functions_path %>
+. <%= scope.lookupvar('r10k::params::functions_path') %>
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 export PATH
 
 start() {
     echo
     echo -n $"Starting webhook: "
-    daemon --user ${DAEMON_USER:?} <%= @start_pidfile_args %> $webhook
+    daemon --user ${DAEMON_USER:?} <%= scope.lookupvar('r10k::params::start_pidfile_args') %> $webhook
     RETVAL=$?
     return $RETVAL
 }