Imagery - Disable layer notify to nginx

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index dddd665221ec4bbc1cd17a1f93834447afa81093..63e0ba91dcc01a32f48e130a6ab0f06d61ed81de 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -27,10 +27,12 @@ property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :extent, String
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :extent, String

-property :background, String
+property :background_colour, String

 property :resample, String, :default => "average"
 property :imagemode, String
 property :resample, String, :default => "average"
 property :imagemode, String

-property :extension, String
+property :extension, String,
+         :is => %w(png png8 jpeg),
+         :default => "png"

 property :max_zoom, Fixnum, :default => 23
 
 action :create do
 property :max_zoom, Fixnum, :default => 23
 
 action :create do


@@ -59,4 +61,42 @@ action :create do
     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{name}.map]"
     subscribes :restart, "template[/etc/init/mapserv-fgi-layer-#{name}.conf]"
   end
     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{name}.map]"
     subscribes :restart, "template[/etc/init/mapserv-fgi-layer-#{name}.conf]"
   end

+
+  directory "/srv/imagery/nginx/#{site}" do
+    owner "root"
+    group "root"
+    mode 0755
+    recursive true
+  end
+
+  template "/srv/imagery/nginx/#{site}/layer-#{name}.conf" do
+    cookbook "imagery"
+    source "nginx_imagery_layer_fragment.conf.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    variables new_resource.to_hash
+    # FIXME notifies :reload, "service[nginx]", :delayed
+  end
+end
+
+action :delete do
+  service "mapserv-fgi-layer-#{name}.conf" do
+    provider Chef::Provider::Service::Upstart
+    action [:stop, :disable]
+    supports :status => true, :restart => true, :reload => false
+  end
+
+  file "/srv/imagery/mapserver/layer-#{name}.map" do
+    action :delete
+  end
+
+  file "/etc/init/mapserv-fgi-layer-#{name}.conf" do
+    action :delete
+  end
+
+  file "/srv/imagery/nginx/#{site}/layer-#{name}.conf" do
+    action :delete
+    # FIXME notifies :reload, "service[nginx]", :delayed
+  end

 end
 end