From: Grant Slater <git@firefishy.com>
Date: Sun, 5 Jan 2014 01:35:51 +0000 (+0000)
Subject: tilecache: minor cleanup
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/491b5238b1afee01db317c224414ac593848bd39?ds=sidebyside

tilecache: minor cleanup
---

diff --git a/cookbooks/nginx/definitions/nginx_site.rb b/cookbooks/nginx/definitions/nginx_site.rb
index 528527b07..64d33db3e 100644
--- 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
-  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]"
diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 9357ee6d7..687478e58 100644
--- 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
-  action :create
   source "nginx_tile_ssl.conf.erb"
 end