Permalink
Browse files

add validation_client_name attribute

  • Loading branch information...
1 parent aece11b commit 6cea6a7c61b27b62395b22312fc9d4a3f7734996 @jtimberman jtimberman committed Mar 3, 2010
Showing with 8 additions and 2 deletions.
  1. +1 −0 chef/attributes/chef.rb
  2. +6 −1 chef/templates/default/client.rb.erb
  3. +1 −1 chef/templates/default/server.rb.erb
@@ -45,6 +45,7 @@
set_unless[:chef][:webui_port] = "4040"
set_unless[:chef][:webui_enabled] = false
set_unless[:chef][:webui_admin_password] = secure_password
+set_unless[:chef][:validation_client_name] = "chef-validator"
case chef[:init_style]
when "runit"
@@ -7,9 +7,14 @@
log_level :info
log_location <%= @client_log %>
ssl_verify_mode :verify_none
+<% case @node[:chef][:url_type] -%>
+<% when "http" -%>
chef_server_url "http://<%= @node[:chef][:server_fqdn] %>:<%= @node[:chef][:server_port] %>"
+<% when "https" -%>
+chef_server_url "https://<%= @node[:chef][:server_fqdn] %>"
+<% end -%>
-validation_client_name "chef-validator"
+validation_client_name "<%= @node[:chef][:validation_client_name] %>"
validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
@@ -20,7 +20,7 @@ openid_cstore_path "<%= @node[:chef][:path] %>/openid/cstore"
search_index_path "<%= @node[:chef][:path] %>/search_index"
role_path "<%= @node[:chef][:serve_path] %>/roles"
-validation_client_name "chef-validator"
+validation_client_name "<%= @node[:chef][:validation_client_name] %>"
validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
web_ui_client_name "chef-webui"

0 comments on commit 6cea6a7

Please sign in to comment.