add validation_client_name attribute

mguterl · Mar 3, 2010 · 6cea6a7 · 6cea6a7
1 parent aece11b
commit 6cea6a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/chef/attributes/chef.rb b/chef/attributes/chef.rb
@@ -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"

diff --git a/chef/templates/default/client.rb.erb b/chef/templates/default/client.rb.erb
@@ -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"
 

diff --git a/chef/templates/default/server.rb.erb b/chef/templates/default/server.rb.erb
@@ -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"