imagery: add default site for socket settings

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 340ed0b6c7876aeeebcedd20e58bf2b6a8e6c56c..8c98e5ddbd4b60a274cf2d6a11dc721632bccbce 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -17,13 +17,15 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+require "yaml"
+

 default_action :create
 
 property :layer, String, :name_property => true
 property :site, String, :required => true
 property :source, String, :required => true
 property :root_layer, [TrueClass, FalseClass], :default => false
 default_action :create
 
 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 :title, String

 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String


@@ -31,37 +33,67 @@ property :extent, String
 property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String

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

 property :url_aliases, [String, Array], :default => []
 property :url_aliases, [String, Array], :default => []

+property :revision, Fixnum, :default => 1
+property :overlay, [TrueClass, FalseClass], :default => false
+property :default_layer, [TrueClass, FalseClass], :default => false

 
 action :create do
 
 action :create do

-  template "/srv/imagery/mapserver/layer-#{layer}.map" do
-    cookbook "imagery"
-    source "mapserver.map.erb"
+  file "create layer yaml definition" do

     owner "root"
     group "root"
     mode 0644
     owner "root"
     group "root"
     mode 0644

-    variables new_resource.to_hash
+    if new_resource.overlay
+      path "/srv/imagery/overlays/#{site}/#{layer}.yml"
+    else
+      path "/srv/imagery/layers/#{site}/#{layer}.yml"
+    end
+    content YAML.dump(:name => layer,
+                      :title => title || layer,
+                      :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :attribution => copyright,
+                      :default => default_layer,
+                      :maxZoom => max_zoom)

   end
 
   end
 

-  template "/etc/init/mapserv-fcgi-layer-#{layer}.conf" do
+  file "remove old layer yaml" do
+    if new_resource.overlay
+      path "/srv/imagery/layers/#{site}/#{layer}.yml" # remove layer if overlay
+    else
+      path "/srv/imagery/overlays/#{site}/#{layer}.yml" # remove overlay if layer
+    end
+    action :delete
+  end
+
+  template "/srv/imagery/mapserver/layer-#{layer}.map" do

     cookbook "imagery"
     cookbook "imagery"

-    source "mapserv_fcgi.conf.erb"
+    source "mapserver.map.erb"

     owner "root"
     group "root"
     mode 0644
     variables new_resource.to_hash
   end
 
     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]
     action [:enable, :start]

-    supports :status => true, :restart => true, :reload => false

     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
     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
   end
 
   directory "/srv/imagery/nginx/#{site}" do


@@ -83,16 +115,14 @@ end
 
 action :delete do
   service "mapserv-fcgi-layer-#{layer}" do
 
 action :delete do
   service "mapserv-fcgi-layer-#{layer}" do

-    provider Chef::Provider::Service::Upstart

     action [:stop, :disable]
     action [:stop, :disable]

-    supports :status => true, :restart => true, :reload => false

   end
 
   file "/srv/imagery/mapserver/layer-#{layer}.map" do
     action :delete
   end
 
   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
 
     action :delete
   end
 


@@ -102,5 +132,6 @@ action :delete do
 end
 
 def after_created
 end
 
 def after_created

+  notifies :create, "imagery_site[#{site}]"

   notifies :restart, "service[nginx]"
 end
   notifies :restart, "service[nginx]"
 end