X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6b22d311817728bcc482d5954eef2ada03e84eca..1a971cb3bac5bfc65c837b143cff3e5bfdd64a12:/cookbooks/imagery/resources/layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index fb1186843..d2aa62a34 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 @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}.#{extension}",
+                      :attribution => copyright,
+                      :maxZoom => max_zoom)
+  end
+
+  file "remove old layer yaml" do
+    if @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,7 +81,8 @@ action :create do
                 "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"
     user "imagery"
     group "imagery"
-    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 6 -- /usr/lib/cgi-bin/mapserv"
+    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"
@@ -101,5 +130,6 @@ action :delete do
 end
 
 def after_created
+  notifies :create, "imagery_site[#{site}]"
   notifies :restart, "service[nginx]"
 end