nginx default sites disabled | fixes #2

acidlabs · Oct 5, 2012 · 9e1d479 · 9e1d479
1 parent e98578a
commit 9e1d479
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@
 /nodes/*.rb
 /roles/*.json
 /roles/*.rb
-/tmp/*
+/tmp/*
+/.vagrant
diff --git a/.vagrant b/.vagrant
diff --git a/site-cookbooks/chef-rails/recipes/default.rb b/site-cookbooks/chef-rails/recipes/default.rb
@@ -2,6 +2,17 @@
   package pkg
 end
 
+bash "remove default nginx sites" do
+  code %{
+    sudo rm -f /etc/nginx/sites-available/default
+    sudo rm -f /etc/nginx/sites-enabled/default
+  }
+end
+
 bash "install or update bundle" do
   code "sudo gem install bundle --no-ri --no-rdoc"
 end
+
+bash "change owner and group of chef-solo tmp files" do
+  code "sudo chown -R #{node[:authorization][:sudo][:users].first}:#{node[:authorization][:sudo][:groups].first} /tmp/chef-solo"
+end
diff --git a/site-cookbooks/nginx/recipes/default.rb b/site-cookbooks/nginx/recipes/default.rb
@@ -65,10 +65,6 @@
 #   mode "0644"
 # end
 
-file "#{node[:nginx][:dir]}/sites-available/default" do
-  action :delete
-end
-
 directory node[:nginx][:proxy_cache_dir] do
   owner node[:nginx][:user]
   group node[:nginx][:user]