Generate HTML and javascript for imagery sites

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 25bcd7b4bb1a6b2cc7b8b8cec4186fe7be07b3a7..13b9b794c6cad45635f802f01fec06df89b781a2 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+require "yaml"
+
 default_action :create
 
 property :layer, String, :name_property => true
@@ -31,37 +33,48 @@ property :extent, String
 property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
-property :extension, String,
-         :is => %w(png png8 jpeg),
-         :default => "png"
+property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 23
 property :url_aliases, [String, Array], :default => []
+property :revision, Fixnum, :default => 1
 
 action :create do
-  template "/srv/imagery/mapserver/layer-#{layer}.map" do
-    cookbook "imagery"
-    source "mapserver.map.erb"
+  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
     owner "root"
     group "root"
     mode 0644
-    variables new_resource.to_hash
+    content YAML.dump(:name => layer,
+                      :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :attribution => copyright)
   end
 
-  template "/etc/init/mapserv-fcgi-layer-#{layer}.conf" do
+  template "/srv/imagery/mapserver/layer-#{layer}.map" do
     cookbook "imagery"
-    source "mapserv_fcgi.conf.erb"
+    source "mapserver.map.erb"
     owner "root"
     group "root"
     mode 0644
     variables new_resource.to_hash
   end
 
-  service "mapserv-fcgi-layer-#{layer}" do
-    provider Chef::Provider::Service::Upstart
+  systemd_service "mapserv-fcgi-#{layer}" do
+    description "Map server for #{layer} layer"
+    limit_nofile 16384
+    environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
+                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"
+    user "imagery"
+    group "imagery"
+    exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket"
+    exec_start "/usr/bin/spawn-fcgi -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{layer}.pid -- /usr/bin/multiwatch -f 4 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
+    pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
+    type "forking"
+    restart "always"
+  end
+
+  service "mapserv-fcgi-#{layer}" do
     action [:enable, :start]
-    supports :status => true, :restart => true, :reload => false
     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
-    subscribes :restart, "template[/etc/init/mapserv-fcgi-layer-#{layer}.conf]"
+    subscribes :restart, "systemd_service[mapserv-fcgi]"
   end
 
   directory "/srv/imagery/nginx/#{site}" do
@@ -83,16 +96,14 @@ 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
+  systemd_service "mapserv-fcgi-#{layer}" do
     action :delete
   end
 
@@ -100,3 +111,8 @@ action :delete do
     action :delete
   end
 end
+
+def after_created
+  notifies :create, "imagery_site[#{site}]"
+  notifies :restart, "service[nginx]"
+end