X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7426769ee7efed7e0559a58bb5e9bfd9f43d6c2a..be85823d780f36df6cda0403657854597ffcd936:/cookbooks/imagery/resources/layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 9356a77a4..340ed0b6c 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -19,22 +19,26 @@
 
 default_action :create
 
-property :name, String
+property :layer, String, :name_property => true
 property :site, String, :required => true
 property :source, String, :required => true
+property :root_layer, [TrueClass, FalseClass], :default => false
 property :text, String
-property :copyright, String, :default =>  "Copyright"
+property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :extent, String
-property :background, String
-property :resample, String, :default =>  "average"
+property :background_colour, String
+property :resample, String, :default => "average"
 property :imagemode, String
-property :extension, String
-property :max_zoom, Fixnum, :default =>  23
+property :extension, String,
+         :is => %w(png png8 jpeg),
+         :default => "png"
+property :max_zoom, Fixnum, :default => 23
+property :url_aliases, [String, Array], :default => []
 
 action :create do
-  template "/srv/imagery/mapserver/layer-#{name}.map" do
+  template "/srv/imagery/mapserver/layer-#{layer}.map" do
     cookbook "imagery"
     source "mapserver.map.erb"
     owner "root"
@@ -43,7 +47,7 @@ action :create do
     variables new_resource.to_hash
   end
 
-  template "/etc/init/mapserv-fgi-layer-#{name}.conf" do
+  template "/etc/init/mapserv-fcgi-layer-#{layer}.conf" do
     cookbook "imagery"
     source "mapserv_fcgi.conf.erb"
     owner "root"
@@ -52,11 +56,51 @@ action :create do
     variables new_resource.to_hash
   end
 
-  service "mapserv-fgi-layer-#{name}.conf" do
+  service "mapserv-fcgi-layer-#{layer}" do
     provider Chef::Provider::Service::Upstart
     action [:enable, :start]
     supports :status => true, :restart => true, :reload => false
-    subscribes :restart, "template[/srv/imagery/mapserver/layer-#{name}.map]"
-    subscribes :restart, "template[/etc/init/mapserv-fgi-layer-#{name}.conf]"
+    subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
+    subscribes :restart, "template[/etc/init/mapserv-fcgi-layer-#{layer}.conf]"
   end
+
+  directory "/srv/imagery/nginx/#{site}" do
+    owner "root"
+    group "root"
+    mode 0755
+    recursive true
+  end
+
+  template "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do
+    cookbook "imagery"
+    source "nginx_imagery_layer_fragment.conf.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    variables new_resource.to_hash
+  end
+end
+
+action :delete do
+  service "mapserv-fcgi-layer-#{layer}" do
+    provider Chef::Provider::Service::Upstart
+    action [:stop, :disable]
+    supports :status => true, :restart => true, :reload => false
+  end
+
+  file "/srv/imagery/mapserver/layer-#{layer}.map" do
+    action :delete
+  end
+
+  file "/etc/init/mapserv-fcgi-layer-#{layer}.conf" do
+    action :delete
+  end
+
+  file "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do
+    action :delete
+  end
+end
+
+def after_created
+  notifies :restart, "service[nginx]"
 end