X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7308cad7a3294f7cd5fbd6db4d438b9358f3fea6..f171579497681fb01212c9de813eb95424c6351e:/cookbooks/imagery/resources/layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 210439b05..bfcfd3424 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -17,13 +17,15 @@
 # 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
-property :text, String
+property :title, String
 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
@@ -32,11 +34,31 @@ property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"
-property :max_zoom, Fixnum, :default => 23
+property :max_zoom, Fixnum, :default => 18
 property :url_aliases, [String, Array], :default => []
-property :revision, Fixnum, :default => 1
+property :revision, Fixnum, :default => 0
+property :overlay, [TrueClass, FalseClass], :default => false
+property :default_layer, [TrueClass, FalseClass], :default => false
 
 action :create do
+  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
+    owner "root"
+    group "root"
+    mode 0644
+    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,
+                      :overlay => overlay)
+  end
+
+  file "remove old overlay yaml" do
+    path "/srv/imagery/overlays/#{site}/#{layer}.yml"
+    action :delete
+  end
+
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
     cookbook "imagery"
     source "mapserver.map.erb"
@@ -50,13 +72,14 @@ action :create 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/",
-                "MS_ERRORFILE" => "/tmp/mapserver-layer-#{layer}.log",
-                "MS_DEBUGLEVEL" => "1"
+                "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
@@ -101,5 +124,6 @@ action :delete do
 end
 
 def after_created
+  notifies :create, "imagery_site[#{site}]"
   notifies :restart, "service[nginx]"
 end