Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

various fixes

  • Loading branch information...
commit b71faf4f5297951ef8d55599c3b3cba767528558 1 parent dfaa5f4
@jsierles authored
View
2  chef/recipes/client.rb
@@ -15,7 +15,7 @@
logrotate "chef-client" do
rotate_count 5
- files "/var/log/chef/*.log"
+ files ["/var/log/chef/*.log"]
end
execute "Register client node with chef server" do
View
8 nginx/recipes/default.rb
@@ -33,6 +33,14 @@
end
end
+template "#{node[:nginx][:dir]}/nginx.conf" do
+ source "nginx.conf.erb"
+ owner "root"
+ group "root"
+ mode 0644
+ notifies :reload, resources(:service => "nginx")
+end
+
service "nginx" do
action [ :enable, :start ]
end
View
4 nginx/templates/default/nginx.conf.erb
@@ -55,7 +55,5 @@ http {
include <%= @node[:nginx][:dir] %>/sites-enabled/*;
proxy_buffers 8 16k;
- proxy_buffer_size 32k;
-
- client_body_temp_path /var/spool/nginx/client_body 1 2;
+ proxy_buffer_size 32k;
}
View
10 rails/recipes/apps.rb
@@ -21,7 +21,7 @@
full_name = "#{app_name}_#{conf[:env]}"
filename = "#{filename}_#{conf[:env]}.conf"
- domain = app[:environments][conf[:env]]["domain"]
+ domain = app["environments"][conf["env"]]["domain"]
ssl_name = domain =~ /\*\.(.+)/ ? "#{$1}_wildcard" : domain
@@ -33,7 +33,7 @@
notifies :reload, resources(:service => "nginx")
end
- template "/etc/nginx/sites-available/#{full_name}" do
+ template "/etc/nginx/sites-available/#{full_name}.conf" do
source "app_nginx.conf.erb"
variables :full_name => full_name, :conf => conf, :app_name => app_name,
:domain => domain, :ssl_name => ssl_name, :app => app
@@ -71,8 +71,12 @@
action [:enable, :load, :start]
end
+ nginx_site full_name do
+ action :enable
+ end
+
logrotate full_name do
- files "/u/apps/#{app_name}/current/log/*.log"
+ files ["/u/apps/#{app_name}/current/log/*.log"]
frequency "daily"
rotate_count 14
compress true
View
10 rails/templates/default/app_nginx_include.conf.erb
@@ -17,16 +17,6 @@ location /nginx_status {
deny all;
}
-location /_raindrops {
- access_log off;
- <% node[:networks].each do |name, addresses| %>
- allow <%= addresses[:network] %>/<%= IPAddr.new(addresses[:netmask]).to_i.to_s(2).count("1") %>;
- <% end %>
- allow 127.0.0.1/32;
- deny all;
- proxy_pass http://<%= @full_name %>;
-}
-
location / {
# use for cloudfront asset cache busting
View
9 redis/recipes/default.rb
@@ -1,8 +1 @@
-remote_file "/tmp/#{node[:redis][:filename]}" do
- source "#{node[:package_url]}/#{node[:redis][:filename]}"
- not_if { File.exists?("/tmp/#{node[:redis][:filename]}") }
-end
-
-dpkg_package "ruby-server" do
- source "/tmp/#{node[:redis][:filename]}"
-end
+package "redis-server"
View
9 users/recipes/default.rb
@@ -95,15 +95,6 @@
end
end
-# Remove initial setup user and group.
-user "ubuntu" do
- action :remove
-end
-
-group "ubuntu" do
- action :remove
-end
-
template "/root/.profile" do
owner "root"
group "root"
Please sign in to comment.
Something went wrong with that request. Please try again.