CHANGELOG

@@ -1,3 +1,6 @@
+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 
 2.5.1 -  Zack Smith

Modulefile

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

files/agent/r10k.rb

@@ -40,13 +40,15 @@ def run_cmd(action,arg=nil)
         output = ''
         git  = ['/usr/bin/env', 'git']
         r10k = ['/usr/bin/env', 'r10k']
+        # Given most people using this are using Puppet Enterprise, add the PE Path
+        environment = {"LC_ALL" => "C","PATH" => "#{ENV['PATH']}:/opt/puppet/bin"}
         case action
           when 'push','pull','status'
             cmd = git
             cmd << 'push'   if action == 'push'
             cmd << 'pull'   if action == 'pull'
             cmd << 'status' if action == 'status'
-            reply[:status] = run(cmd, :stderr => :error, :stdout => :output, :chomp => true, :cwd => arg )
+            reply[:status] = run(cmd, :stderr => :error, :stdout => :output, :chomp => true, :cwd => arg, :environment => environment  )
           when 'cache','synchronize','sync', 'deploy', 'deploy_module'
             cmd = r10k
             cmd << 'cache' if action == 'cache'
@@ -56,7 +58,7 @@ def run_cmd(action,arg=nil)
             elsif action == 'deploy_module'
               cmd << 'deploy' << 'module' << arg
             end
-            reply[:status] = run(cmd, :stderr => :error, :stdout => :output, :chomp => true)
+            reply[:status] = run(cmd, :stderr => :error, :stdout => :output, :chomp => true, :environment => environment)
         end
       end
     end

manifests/params.pp

@@ -47,7 +47,14 @@
   $webhook_prefix_command     = '/bin/echo example'
   $webhook_enable_ssl         = true
   $webhook_use_mcollective    = true
-
+  if $::osfamily == Debian {
+    $functions_path     = '/lib/lsb/init-functions'
+    $start_pidfile_args = '--pidfile=$pidfile'
+  }
+  else {
+    $functions_path     = '/etc/rc.d/init.d/functions'
+    $start_pidfile_args = '--pidfile $pidfile'
+  }
   if $::is_pe == true or $::is_pe == 'true' {
     # Puppet Enterprise specific settings
     $puppetconf_path = '/etc/puppetlabs/puppet'

manifests/webhook.pp

@@ -45,6 +45,7 @@
       ensure  => 'file',
       owner   => 'peadmin',
       group   => 'peadmin',
+      mode    => '0644',
       content => file('/etc/puppetlabs/puppet/ssl/certs/pe-internal-peadmin-mcollective-client.pem'),
   }
 

templates/webhook.init.erb

@@ -15,15 +15,15 @@ DAEMON_USER='<%= @user %>'
 RETVAL=0
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. <%= @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:?} --pidfile $pidfile $webhook
+    daemon --user ${DAEMON_USER:?} <%= @start_pidfile_args %> $webhook
     RETVAL=$?
     return $RETVAL
 }