tilecache: minor cleanup

diff --git a/cookbooks/nginx/definitions/nginx_site.rb b/cookbooks/nginx/definitions/nginx_site.rb
index 528527b07b17cdd8eec8543284087e39a206b500..64d33db3eaf8766ceb50bf5077133277cf6a2cc9 100644 (file)
--- a/cookbooks/nginx/definitions/nginx_site.rb
+++ b/cookbooks/nginx/definitions/nginx_site.rb
@@ -32,9 +32,7 @@ define :nginx_site, :action => [ :create ], :variables => {} do
       variables params[:variables].merge(:name => name, :directory => directory)
       notifies :reload, "service[nginx]"
     end
       variables params[:variables].merge(:name => name, :directory => directory)
       notifies :reload, "service[nginx]"
     end

-  end
-
-  if site_action.include?(:delete)
+  elsif site_action.include?(:delete)

     file "/etc/nginx/conf.d/#{name}.conf" do
       action :delete
       notifies :restart, "service[nginx]"
     file "/etc/nginx/conf.d/#{name}.conf" do
       action :delete
       notifies :restart, "service[nginx]"

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 9357ee6d7f0a191dbd60cc92a371797b821aa1c6..687478e581df41c71ad7fa191fc3c4057a1819a7 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -66,7 +66,6 @@ nginx_site "default" do
 end
 
 nginx_site "tile-ssl" do
 end
 
 nginx_site "tile-ssl" do

-  action :create

   source "nginx_tile_ssl.conf.erb"
 end
 
   source "nginx_tile_ssl.conf.erb"
 end