X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a884ecbc667c29750d26ca2ad8f325f857ead5d3..6015e4b5060ce7b7b06fd11f2e70cd84c25f8dfd:/cookbooks/imagery/resources/layer.rb?ds=sidebyside

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 685631dc6..3ec9a0a70 100644
--- 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
@@ -35,8 +37,34 @@ property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 23
 property :url_aliases, [String, Array], :default => []
 property :revision, Fixnum, :default => 1
+property :overlay, [TrueClass, FalseClass], :default => false
 
 action :create do
+
+  file "create layer yaml definition" do
+    owner "root"
+    group "root"
+    mode 0644
+    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,
+                      :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :attribution => copyright,
+                      :maxZoom => max_zoom)
+  end
+
+  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"
     source "mapserver.map.erb"
@@ -53,8 +81,11 @@ action :create do
                 "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"
     user "imagery"
     group "imagery"
-    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -- /usr/bin/multiwatch -f 4 -- /usr/lib/cgi-bin/mapserv"
-    restart "on-failure"
+    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
@@ -99,5 +130,6 @@ action :delete do
 end
 
 def after_created
+  notifies :create, "imagery_site[#{site}]"
   notifies :restart, "service[nginx]"
 end