X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d5e6ae801dfff473efe2701e560442d21289c549..77c76717bfc26fe7ba1641244164bc1cb5c38429:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 2cf26011c..c2f0e47c5 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -21,67 +21,92 @@ 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/#{site}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 
-  directory "/srv/imagery/layers/#{name}" do
+  directory "/srv/imagery/layers/#{site}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
-  directory "/srv/imagery/overlays/#{name}" do
+  directory "/srv/imagery/overlays/#{site}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
-  template "/srv/#{name}/index.html" do
+  template "/srv/#{site}/index.html" do
     source "index.html.erb"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :title => title
   end
 
-  cookbook_file "/srv/#{name}/imagery.css" do
+  cookbook_file "/srv/#{site}/imagery.css" do
     source "imagery.css"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
   end
 
-  layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|
-    YAML.load(::File.read(path))
+  cookbook_file "/srv/#{site}/clientaccesspolicy.xml" do
+    source "clientaccesspolicy.xml"
+    user "root"
+    group "root"
+    mode 0o644
   end
 
-  template "/srv/#{name}/imagery.js" do
+  cookbook_file "/srv/#{site}/crossdomain.xml" do
+    source "crossdomain.xml"
+    user "root"
+    group "root"
+    mode 0o644
+  end
+
+  layers = Dir.glob("/srv/imagery/layers/#{site}/*.yml").collect do |path|
+    YAML.safe_load(::File.read(path), [Symbol])
+  end
+
+  template "/srv/#{site}/imagery.js" do
     source "imagery.js.erb"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :bbox => bbox, :layers => layers
   end
 
-  nginx_site name do
+  base_domains = [site] + Array(aliases)
+  tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
+
+  ssl_certificate site do
+    domains tile_domains
+  end
+
+  resolvers = node[:networking][:nameservers].map do |resolver|
+    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
+  end
+
+  nginx_site site do
     template "nginx_imagery.conf.erb"
-    directory "/srv/imagery/#{name}"
+    directory "/srv/imagery/#{site}"
     restart_nginx false
-    variables new_resource.to_hash
+    variables new_resource.to_hash.merge(:resolvers => resolvers)
   end
 end
 
 def after_created
-  notifies :restart, "service[nginx]"
+  notifies :reload, "service[nginx]"
 end