From bb57ccd10de7e92efff203892102fae9b0d7c098 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Miller" Date: Sun, 28 Aug 2016 10:07:14 -0400 Subject: [PATCH] adding clarifications --- attributes/default.rb | 5 +++-- recipes/default.rb | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index f5a9bbb0..29008d31 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -19,9 +19,10 @@ # collector possible values: chef-server, chef-compliance, chef-visibility # chef-visibility requires inspec version 0.27.1 or above default['audit']['collector'] = 'chef-server' -# server needed for the 'chef-compliance' and 'chef-server' collectors +# server and token are only needed for the 'chef-compliance' collector default['audit']['server'] = nil -# token needed for the 'chef-compliance' collector +# choose between token and refresh_token +# the token, needed for the 'chef-compliance' collector default['audit']['token'] = nil # refresh_token needed for the 'chef-compliance' collector default['audit']['refresh_token'] = nil diff --git a/recipes/default.rb b/recipes/default.rb index 8c5ff40d..a4691b0b 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -33,6 +33,8 @@ if report_collector == 'chef-compliance' && !refresh_token.nil? token = retrieve_access_token(server, refresh_token, node['audit']['insecure']) node.override['audit']['token'] = token + else + Chef::Log.info("Token Exchange not necessary, using #{report_collector} audit.collector instead.") end end action :run