From 02fd4d0e382174535bbb964893d097eac2b67679 Mon Sep 17 00:00:00 2001 From: Justin Lambert Date: Fri, 9 Nov 2012 15:07:24 -0700 Subject: [PATCH] updated puppet binary location for 2.7/3.0 --- agent/puppetca/agent/puppetca.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/puppetca/agent/puppetca.rb b/agent/puppetca/agent/puppetca.rb index cbd6402..7a1613f 100644 --- a/agent/puppetca/agent/puppetca.rb +++ b/agent/puppetca/agent/puppetca.rb @@ -10,7 +10,7 @@ class Puppetca 20 def startup_hook - @puppetca = @config.pluginconf["puppetca.puppetca"] || "/usr/sbin/puppetca" + @puppetca = @config.pluginconf["puppetca.puppetca"] || "/usr/bin/puppet cert" @cadir = @config.pluginconf["puppetca.cadir"] || "/var/lib/puppet/ssl/ca" end @@ -47,7 +47,7 @@ def startup_hook action "revoke" do validate :certname, :shellsafe - reply[:out] = run("#{@puppetca} --color=none --revoke '#{request[:certname]}'", :stdout => :output, :chomp => true) + reply[:out] = run("#{@puppetca} revoke --color=none '#{request[:certname]}'", :stdout => :output, :chomp => true) end # sign a cert if we have one waiting @@ -59,7 +59,7 @@ def startup_hook reply.fail! "Already have a cert for #{certname} not attempting to sign again" if has_cert?(certname) if cert_waiting?(certname) - reply[:out] = run("#{@puppetca} --color=none --sign '#{request[:certname]}'", :stdout => :output, :chomp => true) + reply[:out] = run("#{@puppetca} sign --color=none '#{request[:certname]}'", :stdout => :output, :chomp => true) else reply.fail "No cert found to sign" end