Skip to content

Commit 3c02934

Browse files
author
jtimberman
committed
cook-135, client log to STDOUT, template to handle which log_location
1 parent c0cf3b6 commit 3c02934

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎chef/attributes/client.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
chef[:client_version] = "0.7.4" unless chef.has_key?(:client_version)
2525
chef[:client_interval] = "1800" unless chef.has_key?(:client_interval)
2626
chef[:client_splay] = "20" unless chef.has_key?(:client_splay)
27-
chef[:client_log] = "/var/log/chef/client.log" unless chef.has_key?(:client_log)
27+
chef[:client_log] = "STDOUT" unless chef.has_key?(:client_log)

‎chef/templates/default/client.rb.erb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
#
66

77
log_level :info
8+
<% if @node[:chef][:client_log] == "STDOUT" -%>
9+
log_location STDOUT
10+
<% else -%>
811
log_location "<%= @node[:chef][:client_log] %>"
12+
<% end -%>
913
ssl_verify_mode :verify_none
1014
registration_url "https://<%= @node[:chef][:server_fqdn] %>"
1115
openid_url "https://<%= @node[:chef][:server_fqdn] %>"

0 commit comments

Comments
 (0)