Specify database for osm2pgsql on rendering servers

[chef.git] / cookbooks / imagery / resources / site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 2cf26011c43ca0da4af0d1ba5c7423e1ba74d022..d0f51a0a6b3430bde89d06232e88bbbbe5a3018f 100644 (file)
--- 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"
   directory "/srv/#{name}" do
     user "root"
     group "root"

-    mode 0755
+    mode 0o755

   end
 
   directory "/srv/imagery/layers/#{name}" do
     user "root"
     group "root"
   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"
     recursive true
   end
 
   directory "/srv/imagery/overlays/#{name}" do
     user "root"
     group "root"

-    mode 0755
+    mode 0o755

     recursive true
   end
 
     recursive true
   end
 


@@ -51,7 +51,7 @@ action :create do
     source "index.html.erb"
     user "root"
     group "root"
     source "index.html.erb"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :title => title
   end
 
     variables :title => title
   end
 


@@ -59,7 +59,21 @@ action :create do
     source "imagery.css"
     user "root"
     group "root"
     source "imagery.css"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644
+  end
+
+  cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do
+    source "clientaccesspolicy.xml"
+    user "root"
+    group "root"
+    mode 0o644
+  end
+
+  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|
   end
 
   layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|


@@ -70,7 +84,7 @@ action :create do
     source "imagery.js.erb"
     user "root"
     group "root"
     source "imagery.js.erb"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :bbox => bbox, :layers => layers
   end
 
     variables :bbox => bbox, :layers => layers
   end
 


@@ -83,5 +97,5 @@ action :create do
 end
 
 def after_created
 end
 
 def after_created

-  notifies :restart, "service[nginx]"
+  notifies :reload, "service[nginx]"

 end
 end