X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/32ded0c2d4fe1519cbc94a6f4ae70452b6d3d6f3..3944d4a4eb4d96ca5e747739f4967f590672d4e4:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 6478faa52..d6e2071cc 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -22,6 +22,7 @@ require "yaml"
 default_action :create
 
 property :name, String
+property :title, String, :required => true
 property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => true
 
@@ -29,20 +30,20 @@ action :create do
   directory "/srv/#{name}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 
   directory "/srv/imagery/layers/#{name}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
   directory "/srv/imagery/overlays/#{name}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
@@ -50,41 +51,62 @@ action :create do
     source "index.html.erb"
     user "root"
     group "root"
-    mode 0644
-    variables :title => name
+    mode 0o644
+    variables :title => title
   end
 
   cookbook_file "/srv/#{name}/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/#{name}/clientaccesspolicy.xml" do
+    source "clientaccesspolicy.xml"
+    user "root"
+    group "root"
+    mode 0o644
   end
 
-  overlays = Dir.glob("/srv/imagery/overlays/#{name}/*.yml").collect do |path|
-    YAML.load(::File.read(path))
+  cookbook_file "/srv/#{name}/crossdomain.xml" do
+    source "crossdomain.xml"
+    user "root"
+    group "root"
+    mode 0o644
+  end
+
+  layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|
+    YAML.safe_load(::File.read(path), [Symbol])
   end
 
   template "/srv/#{name}/imagery.js" do
     source "imagery.js.erb"
     user "root"
     group "root"
-    mode 0644
-    variables :bbox => bbox, :layers => layers, :overlays => overlays
+    mode 0o644
+    variables :bbox => bbox, :layers => layers
+  end
+
+  base_domains = [name] + Array(aliases)
+  tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
+
+  ssl_certificate new_resource.name do
+    domains tile_domains
+  end
+
+  resolvers = node[:networking][:nameservers].map do |resolver|
+    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
   end
 
-  nginx_site name do
+  nginx_site new_resource.name do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{name}"
     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