X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/df4783f181b8eb09cf1b48a28a41ca8d14283258..de23cf1d7f7dcdae563ab4b89e94437f6169286b:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 137153a72..9cea98f0a 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -21,33 +21,33 @@ require "yaml"
 
 default_action :create
 
-property :name, String
+property :site, String, :name_property => true
 property :title, String, :required => true
 property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => true
 
 action :create do
-  directory "/srv/#{name}" do
+  directory "/srv/#{new_resource.site}" do
     user "root"
     group "root"
     mode 0o755
   end
 
-  directory "/srv/imagery/layers/#{name}" do
+  directory "/srv/imagery/layers/#{new_resource.site}" do
     user "root"
     group "root"
     mode 0o755
     recursive true
   end
 
-  directory "/srv/imagery/overlays/#{name}" do
+  directory "/srv/imagery/overlays/#{new_resource.site}" do
     user "root"
     group "root"
     mode 0o755
     recursive true
   end
 
-  template "/srv/#{name}/index.html" do
+  declare_resource :template, "/srv/#{new_resource.site}/index.html" do
     source "index.html.erb"
     user "root"
     group "root"
@@ -55,52 +55,53 @@ action :create do
     variables :title => title
   end
 
-  cookbook_file "/srv/#{name}/imagery.css" do
+  cookbook_file "/srv/#{new_resource.site}/imagery.css" do
     source "imagery.css"
     user "root"
     group "root"
     mode 0o644
   end
 
-  cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do
+  cookbook_file "/srv/#{new_resource.site}/clientaccesspolicy.xml" do
     source "clientaccesspolicy.xml"
     user "root"
     group "root"
     mode 0o644
   end
 
-  cookbook_file "/srv/#{name}/crossdomain.xml" do
+  cookbook_file "/srv/#{new_resource.site}/crossdomain.xml" do
     source "crossdomain.xml"
     user "root"
     group "root"
     mode 0o644
   end
 
-  layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|
+  layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
     YAML.safe_load(::File.read(path), [Symbol])
   end
 
-  template "/srv/#{name}/imagery.js" do
+  declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do
     source "imagery.js.erb"
     user "root"
     group "root"
     mode 0o644
-    variables :bbox => bbox, :layers => layers
+    variables :bbox => new_resource.bbox, :layers => layers
   end
 
-  base_domains = [name] + Array(aliases)
+  base_domains = [new_resource.site] + Array(new_resource.aliases)
+  tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
 
-  ssl_certificate new_resource.name do
-    domains base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
+  ssl_certificate new_resource.site do
+    domains tile_domains
   end
 
   resolvers = node[:networking][:nameservers].map do |resolver|
     IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
   end
 
-  nginx_site new_resource.name do
+  nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
-    directory "/srv/imagery/#{name}"
+    directory "/srv/imagery/#{new_resource.site}"
     restart_nginx false
     variables new_resource.to_hash.merge(:resolvers => resolvers)
   end