X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/911c341fc1a9c341fe1aadfcdf6ce32864180ae7..ccf41349604c06d3822e56c4c5b2dacc3e38bba4:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index a2c94b953..d0f51a0a6 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -30,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
 
@@ -51,7 +51,7 @@ action :create do
     source "index.html.erb"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :title => title
   end
 
@@ -59,14 +59,24 @@ action :create 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|
+  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.load(::File.read(path))
   end
 
@@ -74,8 +84,8 @@ action :create 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
 
   nginx_site name do
@@ -87,5 +97,5 @@ action :create do
 end
 
 def after_created
-  notifies :restart, "service[nginx]"
+  notifies :reload, "service[nginx]"
 end