Browse Source

@node is deprecated, use node, chef commit f904589

jtimberman 14 years ago
parent
commit
322bb62c94

+ 3 - 3
templates/default/myproj.conf.erb

@@ -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 - 3
templates/default/rails_nginx_passenger.conf.erb

@@ -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 - 1
templates/default/sv-unicorn-run.erb

@@ -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