X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e5f294d3dc676675b2803915571c28337468c3b3..8d4bc9baedbfb47cc7230173bf5c25376f3c38b0:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index d159a7ac3..9519b63bd 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -47,12 +47,12 @@ action :create do
     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"
     mode 0o644
-    variables :title => title
+    variables :title => new_resource.title
   end
 
   cookbook_file "/srv/#{new_resource.site}/imagery.css" do
@@ -80,7 +80,7 @@ action :create do
     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"
@@ -95,15 +95,11 @@ action :create do
     domains tile_domains
   end
 
-  resolvers = node[:networking][:nameservers].map do |resolver|
-    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-  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)
+    variables new_resource.to_hash
   end
 end