Log upstream IP on tile servers

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 6478faa52b1549266ed642757cb94bca69ddc6ae..d0f51a0a6b3430bde89d06232e88bbbbe5a3018f 100644 (file)
--- 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,22 +51,32 @@ 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|
+  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
 
@@ -73,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
@@ -86,5 +97,5 @@ action :create do
 end
 
 def after_created
-  notifies :restart, "service[nginx]"
+  notifies :reload, "service[nginx]"
 end