Disable chef exception handler

[chef.git] / cookbooks / imagery / resources / site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index d159a7ac36b1c00e4774571fc8b4a790181806ab..9cea98f0a2cdff5c59b84c87f81e55127abdd7c5 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -47,7 +47,7 @@ action :create do
     recursive true
   end
 
     recursive true
   end
 

-  template "/srv/#{new_resource.site}/index.html" do
+  declare_resource :template, "/srv/#{new_resource.site}/index.html" do

     source "index.html.erb"
     user "root"
     group "root"
     source "index.html.erb"
     user "root"
     group "root"


@@ -80,7 +80,7 @@ action :create do
     YAML.safe_load(::File.read(path), [Symbol])
   end
 
     YAML.safe_load(::File.read(path), [Symbol])
   end
 

-  template "/srv/#{new_resource.site}/imagery.js" do
+  declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do

     source "imagery.js.erb"
     user "root"
     group "root"
     source "imagery.js.erb"
     user "root"
     group "root"


@@ -100,7 +100,7 @@ action :create do
   end
 
   nginx_site new_resource.site do
   end
 
   nginx_site new_resource.site do

-    template_source "nginx_imagery.conf.erb"
+    template "nginx_imagery.conf.erb"

     directory "/srv/imagery/#{new_resource.site}"
     restart_nginx false
     variables new_resource.to_hash.merge(:resolvers => resolvers)
     directory "/srv/imagery/#{new_resource.site}"
     restart_nginx false
     variables new_resource.to_hash.merge(:resolvers => resolvers)