← Back to branch summary

~ubuntu-branches/ubuntu/saucy/cloud-init/saucy

« back to all changes in this revision

Viewing changes to templates/chef_client.rb.tmpl

  • Committer: Package Import Robot
  • Author(s): Scott Moser, Mike Moulton, Avishai Ish-Shalom
  • Date: 2011-09-13 17:02:48 UTC
  • mto: (174.2.1 precise)
  • mto: This revision was merged to the branch mainline in revision 136.
  • Revision ID: package-import@ubuntu.com-20110913170248-4ty3t0epmq8cg9wz
https://launchpad.net/bugs/845208
* minor documentation improvement.

[Mike Moulton, Avishai Ish-Shalom]
* Chef support fixes. support for environment and initial attr (LP: #845208)

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/chef_client.rb.tmpl
1
 
log_level          :info
2
 
log_location       "/var/log/chef/client.log"
3
 
ssl_verify_mode    :verify_none
 
1
log_level              :info
 
2
log_location           "/var/log/chef/client.log"
 
3
ssl_verify_mode        :verify_none
4
4
validation_client_name "$validation_name"
5
5
validation_key         "/etc/chef/validation.pem"
6
 
client_key               "/etc/chef/client.pem"
7
 
chef_server_url    "$server_url"
8
 
file_cache_path    "/var/cache/chef"
9
 
file_backup_path  "/var/backups/chef"
10
 
pid_file           "/var/run/chef/client.pid"
 
6
client_key             "/etc/chef/client.pem"
 
7
chef_server_url        "$server_url"
 
8
environment            "$environment"
 
9
node_name              "$node_name"
 
10
json_attribs           "/etc/chef/firstboot.json"
 
11
file_cache_path        "/var/cache/chef"
 
12
file_backup_path       "/var/backups/chef"
 
13
pid_file               "/var/run/chef/client.pid"
11
14
Chef::Log::Formatter.show_time = true
12
15