Permalink
Browse files

@node is deprecated, use node, chef commit f904589

  • Loading branch information...
1 parent 6cd72a1 commit 1193f67beff7b61c0474df4582b87119bb5c2294 @jtimberman jtimberman committed Jun 13, 2010
Showing with 485 additions and 485 deletions.
  1. +1 −1 activemq/templates/default/sv-activemq-run.erb
  2. +1 −1 apache2/templates/default/a2dismod.erb
  3. +2 −2 apache2/templates/default/a2dissite.erb
  4. +1 −1 apache2/templates/default/a2enmod.erb
  5. +1 −1 apache2/templates/default/a2ensite.erb
  6. +28 −28 apache2/templates/default/apache2.conf.erb
  7. +4 −4 apache2/templates/default/default-site.erb
  8. +1 −1 apache2/templates/default/mod_auth_openid.rb.erb
  9. +2 −2 apache2/templates/default/mods/alias.conf.erb
  10. +1 −1 apache2/templates/default/mods/fcgid.conf.erb
  11. +2 −2 apache2/templates/default/mods/ssl.conf.erb
  12. +3 −3 apache2/templates/default/security.erb
  13. +3 −3 apache2/templates/default/web_app.conf.erb
  14. +3 −3 application/templates/default/myproj.conf.erb
  15. +3 −3 application/templates/default/rails_nginx_passenger.conf.erb
  16. +1 −1 application/templates/default/sv-unicorn-run.erb
  17. +6 −6 bootstrap/templates/default/client.rb.erb
  18. +13 −13 bootstrap/templates/default/server.rb.erb
  19. +2 −2 bootstrap/templates/default/sv-chef-client-run.erb
  20. +2 −2 bootstrap/templates/default/sv-chef-server-run.erb
  21. +2 −2 bootstrap/templates/default/sv-chef-server-webui-run.erb
  22. +1 −1 bootstrap/templates/default/sv-chef-solr-indexer-run.erb
  23. +1 −1 bootstrap/templates/default/sv-chef-solr-run.erb
  24. +13 −13 chef/templates/default/chef_server.conf.erb
  25. +6 −6 chef/templates/default/client.rb.erb
  26. +14 −14 chef/templates/default/server.rb.erb
  27. +2 −2 chef/templates/default/sv-chef-client-run.erb
  28. +2 −2 chef/templates/default/sv-chef-server-run.erb
  29. +2 −2 chef/templates/default/sv-chef-server-webui-run.erb
  30. +1 −1 chef/templates/default/sv-chef-solr-indexer-run.erb
  31. +1 −1 chef/templates/default/sv-chef-solr-run.erb
  32. +3 −3 database/templates/default/app_grants.sql.erb
  33. +1 −1 djbdns/templates/default/sv-axfrdns-run.erb
  34. +1 −1 djbdns/templates/default/sv-public-dnscache-run.erb
  35. +1 −1 djbdns/templates/default/sv-tinydns-internal-run.erb
  36. +1 −1 djbdns/templates/default/sv-tinydns-run.erb
  37. +2 −2 djbdns/templates/default/tinydns-data.erb
  38. +2 −2 djbdns/templates/default/tinydns-internal-data.erb
  39. +6 −6 dynomite/templates/default/sv-dynomite-run.erb
  40. +3 −3 gems/templates/default/gem_server.conf.erb
  41. +27 −27 glassfish/templates/default/answer_file.erb
  42. +2 −2 glassfish/templates/default/glassfish-init.d-script.erb
  43. +4 −4 god/templates/default/master.god.erb
  44. +2 −2 hadoop/templates/default/cloudera.list.erb
  45. +2 −2 instiki/templates/default/instiki.conf.erb
  46. +9 −9 jira/templates/default/apache.conf.erb
  47. +1 −1 jira/templates/default/entityengine.xml.erb
  48. +3 −3 jira/templates/default/server.xml.erb
  49. +2 −2 jira/templates/default/sv-jira-run.erb
  50. +1 −1 keepalived/templates/default/keepalived.conf.erb
  51. +2 −2 kickstart/templates/default/kickstart.conf.erb
  52. +2 −2 kickstart/templates/default/ks.cfg.erb
  53. +3 −3 maradns/templates/default/mararc.erb
  54. +4 −4 munin/templates/default/apache2.conf.erb
  55. +2 −2 munin/templates/default/munin-node.conf.erb
  56. +2 −2 mysql/templates/default/debian.cnf.erb
  57. +5 −5 mysql/templates/default/grants.sql.erb
  58. +12 −12 mysql/templates/default/my.cnf.erb
  59. +2 −2 mysql/templates/default/mysql-server.seed.erb
  60. +12 −12 mysql/templates/ubuntu-10.04/my.cnf.erb
  61. +12 −12 mysql/templates/ubuntu-8.04/my.cnf.erb
  62. +12 −12 mysql/templates/ubuntu-9.10/my.cnf.erb
  63. +4 −4 nagios/libraries/default.rb
  64. +5 −5 nagios/templates/default/apache2.conf.erb
  65. +3 −3 nagios/templates/default/cgi.cfg.erb
  66. +1 −1 nagios/templates/default/commands.cfg.erb
  67. +1 −1 nagios/templates/default/hosts.cfg.erb
  68. +16 −16 nagios/templates/default/nagios.cfg.erb
  69. +8 −8 nagios/templates/default/nrpe.cfg.erb
  70. +2 −2 nginx/templates/default/default-site.erb
  71. +18 −18 nginx/templates/default/nginx.conf.erb
  72. +1 −1 nginx/templates/default/nxdissite.erb
  73. +1 −1 nginx/templates/default/nxensite.erb
  74. +1 −1 nginx/templates/default/sv-nginx-run.erb
  75. +2 −2 ntp/templates/default/ntp.conf.erb
  76. +2 −2 openldap/templates/default/ldap-ldap.conf.erb
  77. +7 −7 openldap/templates/default/ldap.conf.erb
  78. +6 −6 openldap/templates/default/libnss-ldap.conf.erb
  79. +4 −4 openldap/templates/default/login_access.conf.erb
  80. +25 −25 openldap/templates/default/slapd.conf.erb
  81. +1 −1 packages/libraries/packages.rb
  82. +2 −2 passenger_apache2/templates/default/passenger.conf.erb
  83. +1 −1 passenger_apache2/templates/default/passenger.load.erb
  84. +4 −4 passenger_apache2/templates/default/passenger_web_app.conf.erb
  85. +4 −4 passenger_apache2/templates/default/web_app.conf.erb
  86. +2 −2 passenger_enterprise/templates/default/passenger.conf.erb
  87. +1 −1 passenger_enterprise/templates/default/passenger.load.erb
  88. +2 −2 passenger_enterprise/templates/default/passenger_nginx.conf.erb
  89. +6 −6 php/templates/default/php.conf.erb
  90. +16 −16 postfix/templates/default/main.cf.erb
  91. +1 −1 postfix/templates/default/sasl_passwd.erb
  92. +1 −1 rabbitmq/templates/default/doterlang.cookie.erb
  93. +9 −9 rabbitmq/templates/default/rabbitmq.config.erb
  94. +2 −2 rabbitmq/templates/default/rabbitmq_cluster.config.erb
  95. +1 −1 radiant/libraries/radiant.rb
  96. +3 −3 radiant/templates/default/radiant.conf.erb
  97. +4 −4 rails/templates/default/rails_app.conf.erb
  98. +3 −3 redmine/templates/default/database.yml.erb
  99. +2 −2 redmine/templates/default/redmine.conf.erb
  100. +1 −1 redmine/templates/default/sv-redmine-run.erb
  101. +7 −7 reprepro/recipes/default.rb
  102. +3 −3 reprepro/templates/default/apt_repo.conf.erb
  103. +3 −3 reprepro/templates/default/distributions.erb
  104. +2 −2 resolver/templates/default/resolv.conf.erb
  105. +6 −6 riak/templates/default/iptables.erb
  106. +1 −1 solr/templates/default/sv-solr-run.erb
  107. +1 −1 ssh_known_hosts/templates/default/known_hosts.erb
  108. +1 −1 stompserver/templates/default/sv-stompserver-run.erb
  109. +1 −1 sudo/templates/default/sudoers.erb
  110. +2 −2 teamspeak/templates/default/server.ini.erb
  111. +1 −1 tomcat6/libraries/tomcat_manager.rb
  112. +1 −1 tomcat6/recipes/default.rb
  113. +1 −1 tomcat6/templates/default/manager.xml.erb
  114. +1 −1 tomcat6/templates/default/tomcat-users.xml.erb
  115. +7 −7 tomcat6/templates/default/tomcat6.conf.erb
  116. +2 −2 wordpress/recipes/default.rb
  117. +1 −1 wordpress/templates/default/grants.sql.erb
  118. +3 −3 wordpress/templates/default/wordpress.conf.erb
@@ -1,3 +1,3 @@
#!/bin/sh
exec 2>&1
-exec /opt/apache-activemq-<%= @node[:activemq][:version] %>/bin/activemq
+exec /opt/apache-activemq-<%= node[:activemq][:version] %>/bin/activemq
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which module would you like to disable?"
@@ -1,11 +1,11 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which site would you like to disable?"
echo -n "Your choices are: "
- ls $@node[:apache][:dir]/sites-enabled/* | \
+ ls $node[:apache][:dir]/sites-enabled/* | \
sed -e "s,$SYSCONFDIR/sites-enabled/,,g" | xargs echo
echo -n "Site name? "
read SITENAME
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which module would you like to enable?"
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which site would you like to enable?"
@@ -3,12 +3,12 @@
#
# Based on the Ubuntu apache2.conf
-ServerRoot "<%= @node[:apache][:dir] %>"
+ServerRoot "<%= node[:apache][:dir] %>"
#
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
#
-<% if @node[:platform] == "debian" || @node[:platform] == "ubuntu" -%>
+<% if node[:platform] == "debian" || node[:platform] == "ubuntu" -%>
LockFile /var/lock/apache2/accept.lock
<% else %>
LockFile logs/accept.lock
@@ -18,9 +18,9 @@ LockFile logs/accept.lock
# PidFile: The file in which the server should record its process
# identification number when it starts.
#
-<% if @node[:platform] == "debian" || @node[:platform] == "ubuntu" -%>
+<% if node[:platform] == "debian" || node[:platform] == "ubuntu" -%>
PidFile /var/run/apache2.pid
-<% elsif @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% elsif node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
PidFile /var/run/httpd.pid
<% else -%>
PidFile logs/httpd.pid
@@ -29,26 +29,26 @@ PidFile logs/httpd.pid
#
# Timeout: The number of seconds before receives and sends time out.
#
-Timeout <%= @node[:apache][:timeout] %>
+Timeout <%= node[:apache][:timeout] %>
#
# KeepAlive: Whether or not to allow persistent connections (more than
# one request per connection). Set to "Off" to deactivate.
#
-KeepAlive <%= @node[:apache][:keepalive] %>
+KeepAlive <%= node[:apache][:keepalive] %>
#
# MaxKeepAliveRequests: The maximum number of requests to allow
# during a persistent connection. Set to 0 to allow an unlimited amount.
# We recommend you leave this number high, for maximum performance.
#
-MaxKeepAliveRequests <%= @node[:apache][:keepaliverequests] %>
+MaxKeepAliveRequests <%= node[:apache][:keepaliverequests] %>
#
# KeepAliveTimeout: Number of seconds to wait for the next request from the
# same client on the same connection.
#
-KeepAliveTimeout <%= @node[:apache][:keepalivetimeout] %>
+KeepAliveTimeout <%= node[:apache][:keepalivetimeout] %>
##
## Server-Pool Size Regulation (MPM specific)
@@ -61,12 +61,12 @@ KeepAliveTimeout <%= @node[:apache][:keepalivetimeout] %>
# MaxClients: maximum number of server processes allowed to start
# MaxRequestsPerChild: maximum number of requests a server process serves
<IfModule mpm_prefork_module>
- StartServers <%= @node[:apache][:prefork][:startservers] %>
- MinSpareServers <%= @node[:apache][:prefork][:minspareservers] %>
- MaxSpareServers <%= @node[:apache][:prefork][:maxspareservers] %>
- ServerLimit <%= @node[:apache][:prefork][:serverlimit] %>
- MaxClients <%= @node[:apache][:prefork][:maxclients] %>
- MaxRequestsPerChild <%= @node[:apache][:prefork][:maxrequestsperchild] %>
+ StartServers <%= node[:apache][:prefork][:startservers] %>
+ MinSpareServers <%= node[:apache][:prefork][:minspareservers] %>
+ MaxSpareServers <%= node[:apache][:prefork][:maxspareservers] %>
+ ServerLimit <%= node[:apache][:prefork][:serverlimit] %>
+ MaxClients <%= node[:apache][:prefork][:maxclients] %>
+ MaxRequestsPerChild <%= node[:apache][:prefork][:maxrequestsperchild] %>
</IfModule>
# worker MPM
@@ -77,16 +77,16 @@ KeepAliveTimeout <%= @node[:apache][:keepalivetimeout] %>
# ThreadsPerChild: constant number of worker threads in each server process
# MaxRequestsPerChild: maximum number of requests a server process serves
<IfModule mpm_worker_module>
- StartServers <%= @node[:apache][:worker][:startservers] %>
- MaxClients <%= @node[:apache][:worker][:maxclients] %>
- MinSpareThreads <%= @node[:apache][:worker][:minsparethreads] %>
- MaxSpareThreads <%= @node[:apache][:worker][:maxsparethreads] %>
- ThreadsPerChild <%= @node[:apache][:worker][:threadsperchild] %>
- MaxRequestsPerChild <%= @node[:apache][:worker][:maxrequestsperchild] %>
+ StartServers <%= node[:apache][:worker][:startservers] %>
+ MaxClients <%= node[:apache][:worker][:maxclients] %>
+ MinSpareThreads <%= node[:apache][:worker][:minsparethreads] %>
+ MaxSpareThreads <%= node[:apache][:worker][:maxsparethreads] %>
+ ThreadsPerChild <%= node[:apache][:worker][:threadsperchild] %>
+ MaxRequestsPerChild <%= node[:apache][:worker][:maxrequestsperchild] %>
</IfModule>
-User <%= @node[:apache][:user] %>
-Group <%= @node[:apache][:user] %>
+User <%= node[:apache][:user] %>
+Group <%= node[:apache][:user] %>
#
# AccessFileName: The name of the file to look for in each directory
@@ -133,7 +133,7 @@ HostnameLookups Off
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
-ErrorLog <%= @node[:apache][:log_dir] %>/error.log
+ErrorLog <%= node[:apache][:log_dir] %>/error.log
#
# LogLevel: Control the number of messages logged to the error_log.
@@ -143,11 +143,11 @@ ErrorLog <%= @node[:apache][:log_dir] %>/error.log
LogLevel warn
# Include module configuration:
-Include <%= @node[:apache][:dir] %>/mods-enabled/*.load
-Include <%= @node[:apache][:dir] %>/mods-enabled/*.conf
+Include <%= node[:apache][:dir] %>/mods-enabled/*.load
+Include <%= node[:apache][:dir] %>/mods-enabled/*.conf
# Include ports listing
-Include <%= @node[:apache][:dir] %>/ports.conf
+Include <%= node[:apache][:dir] %>/ports.conf
#
# The following directives define some format nicknames for use with
@@ -224,7 +224,7 @@ LogFormat "%{User-agent}i" agent
# Include generic snippets of statements
-Include <%= @node[:apache][:dir] %>/conf.d/
+Include <%= node[:apache][:dir] %>/conf.d/
# Include the virtual host configurations:
-Include <%= @node[:apache][:dir] %>/sites-enabled/
+Include <%= node[:apache][:dir] %>/sites-enabled/
@@ -1,5 +1,5 @@
<VirtualHost *:80>
- ServerAdmin <%= @node[:apache][:contact] %>
+ ServerAdmin <%= node[:apache][:contact] %>
DocumentRoot /var/www/
<Directory />
@@ -24,13 +24,13 @@
Allow from all
</Directory>
- ErrorLog <%= @node[:apache][:log_dir] %>/error.log
+ ErrorLog <%= node[:apache][:log_dir] %>/error.log
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn
- CustomLog <%= @node[:apache][:log_dir] %>/access.log combined
+ CustomLog <%= node[:apache][:log_dir] %>/access.log combined
ServerSignature On
Alias /doc/ "/usr/share/doc/"
@@ -42,7 +42,7 @@
Allow from 127.0.0.0/255.0.0.0 ::1/128
</Directory>
- <% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+ <% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
#
# This configuration file enables the default "Welcome"
# page if there is no default index page present for
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
allowed_openids = Array.new
-<% @node[:apache][:allowed_openids].each do |id| -%>
+<% node[:apache][:allowed_openids].each do |id| -%>
allowed_openids << "<%= id %>"
<% end -%>
@@ -12,9 +12,9 @@
# We include the /icons/ alias for FancyIndexed directory listings. If
# you do not use FancyIndexing, you may comment this out.
#
-Alias /icons/ "<%= @node[:apache][:icondir] %>"
+Alias /icons/ "<%= node[:apache][:icondir] %>"
-<Directory "<%= @node[:apache][:icondir] %>">
+<Directory "<%= node[:apache][:icondir] %>">
Options Indexes MultiViews
AllowOverride None
Order allow,deny
@@ -3,7 +3,7 @@
IPCConnectTimeout 20
</IfModule>
-<% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
# Sane place to put sockets and shared memory file
SocketPath run/mod_fcgid
SharememPath run/mod_fcgid/fcgid_shm
@@ -39,7 +39,7 @@ SSLPassPhraseDialog builtin
# Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds).
#SSLSessionCache dbm:/var/run/apache2/ssl_scache
-<% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000)
<% else -%>
SSLSessionCache shmcb:/var/run/apache2/ssl_scache
@@ -49,7 +49,7 @@ SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
-<% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
SSLMutex default
<% else -%>
SSLMutex file:/var/run/apache2/ssl_mutex
@@ -24,7 +24,7 @@
# where Full conveys the most information, and Prod the least.
#
#ServerTokens Minimal
-ServerTokens <%= @node[:apache][:servertokens] %>
+ServerTokens <%= node[:apache][:servertokens] %>
#
# Optionally add a line containing the server version and virtual host
@@ -35,7 +35,7 @@ ServerTokens <%= @node[:apache][:servertokens] %>
# Set to one of: On | Off | EMail
#
#ServerSignature Off
-ServerSignature <%= @node[:apache][:serversignature] %>
+ServerSignature <%= node[:apache][:serversignature] %>
#
# Allow TRACE method
@@ -46,5 +46,5 @@ ServerSignature <%= @node[:apache][:serversignature] %>
# Set to one of: On | Off | extended
#
#TraceEnable Off
-TraceEnable <%= @node[:apache][:traceenable] %>
+TraceEnable <%= node[:apache][:traceenable] %>
@@ -25,11 +25,11 @@
</Location>
LogLevel info
- ErrorLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
- CustomLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
+ ErrorLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
+ CustomLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
RewriteEngine On
- RewriteLog <%= @node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log
+ RewriteLog <%= node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log
RewriteLogLevel 0
# Canonical host, <%= @params[:server_name] %>
@@ -1,13 +1,13 @@
# nginx + passenger application vhost
#
-# Generated by Chef for <%= @node[:fqdn] %>
+# Generated by Chef for <%= node[:fqdn] %>
# Local modifications will be overwritten.
#
server {
listen 80;
server_name <%= @server_name %><% @server_aliases.each do |a| %><%= " #{a}" %> <% end %>;
root <%= @docroot %>;
- error_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-error.log;
- access_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-access.log;
+ error_log <%= node[:nginx][:log_dir] %>/<%= @app %>-error.log;
+ access_log <%= node[:nginx][:log_dir] %>/<%= @app %>-access.log;
passenger_enabled on;
}
@@ -1,13 +1,13 @@
# nginx + passenger application vhost
#
-# Generated by Chef for <%= @node[:fqdn] %>
+# Generated by Chef for <%= node[:fqdn] %>
# Local modifications will be overwritten.
#
server {
listen 80;
server_name <%= @server_name %><% @server_aliases.each do |a| %><%= " #{a}" %> <% end %>;
root <%= @docroot %>;
- error_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-error.log;
- access_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-access.log;
+ error_log <%= node[:nginx][:log_dir] %>/<%= @app %>-error.log;
+ access_log <%= node[:nginx][:log_dir] %>/<%= @app %>-access.log;
passenger_enabled on;
}
@@ -3,5 +3,5 @@
cd <%= @options[:app]['deploy_to'] %>/current
exec 2>&1
-exec chpst -u <%= @options[:app]["owner"] %>:<%= @options[:app]["group"] %> unicorn_rails -E <%= @node[:app_environment] %> -c /etc/unicorn/<%= @options[:app]['id'] %>.rb
+exec chpst -u <%= @options[:app]["owner"] %>:<%= @options[:app]["group"] %> unicorn_rails -E <%= node[:app_environment] %> -c /etc/unicorn/<%= @options[:app]['id'] %>.rb
@@ -7,18 +7,18 @@
log_level :info
log_location <%= @client_log %>
ssl_verify_mode :verify_none
-<% case @node[:bootstrap][:chef][:url_type] -%>
+<% case node[:bootstrap][:chef][:url_type] -%>
<% when "http" -%>
-chef_server_url "http://<%= @node[:bootstrap][:chef][:server_fqdn] %>:<%= @node[:bootstrap][:chef][:server_port] %>"
+chef_server_url "http://<%= node[:bootstrap][:chef][:server_fqdn] %>:<%= node[:bootstrap][:chef][:server_port] %>"
<% when "https" -%>
-chef_server_url "https://<%= @node[:bootstrap][:chef][:server_fqdn] %>"
+chef_server_url "https://<%= node[:bootstrap][:chef][:server_fqdn] %>"
<% end -%>
-validation_client_name "<%= @node[:bootstrap][:chef][:validation_client_name] %>"
+validation_client_name "<%= node[:bootstrap][:chef][:validation_client_name] %>"
validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
-file_cache_path "<%= @node[:bootstrap][:chef][:cache_path] %>"
-pid_file "<%= @node[:bootstrap][:chef][:run_path] %>/chef-client.pid"
+file_cache_path "<%= node[:bootstrap][:chef][:cache_path] %>"
+pid_file "<%= node[:bootstrap][:chef][:run_path] %>/chef-client.pid"
Mixlib::Log::Formatter.show_time = <%= @show_time %>
Oops, something went wrong.

0 comments on commit 1193f67

Please sign in to comment.