X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a884ecbc667c29750d26ca2ad8f325f857ead5d3..acb5ea419113188317bc7bede334b90e12efd5ce:/cookbooks/imagery/resources/layer.rb?ds=inline diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index 685631dc6..dc1fd51bb 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: imagery +# Cookbook:: imagery # Resource:: imagery_layer # -# Copyright 2016, OpenStreetMap Foundation +# Copyright:: 2016, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,13 +17,17 @@ # limitations under the License. # +require "yaml" + +unified_mode true + 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 :source, String, :required => [:create] +property :root_layer, [true, false], :default => false +property :title, String property :copyright, String, :default => "Copyright" property :projection, String, :default => "EPSG:3857" property :palette, String @@ -32,72 +36,67 @@ 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, Integer, :default => 18 property :url_aliases, [String, Array], :default => [] -property :revision, Fixnum, :default => 1 +property :revision, Integer, :default => 0 +property :overlay, [true, false], :default => false +property :default_layer, [true, false], :default => false action :create do - template "/srv/imagery/mapserver/layer-#{layer}.map" do + file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do + owner "root" + group "root" + mode "644" + content YAML.dump(:name => new_resource.layer, + :title => new_resource.title || new_resource.layer, + :url => "//{s}.#{new_resource.site}/layer/#{new_resource.layer}/{z}/{x}/{y}.png", + :attribution => new_resource.copyright, + :default => new_resource.default_layer, + :maxZoom => new_resource.max_zoom, + :overlay => new_resource.overlay) + end + + template "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do cookbook "imagery" source "mapserver.map.erb" owner "root" group "root" - mode 0644 + mode "644" variables new_resource.to_hash end - 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 "/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" - end - - service "mapserv-fcgi-#{layer}" do - action [:enable, :start] - subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]" - subscribes :restart, "systemd_service[mapserv-fcgi]" - end - - directory "/srv/imagery/nginx/#{site}" do + directory "/srv/imagery/nginx/#{new_resource.site}" do owner "root" group "root" - mode 0755 + mode "755" recursive true end - template "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do + template "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do cookbook "imagery" source "nginx_imagery_layer_fragment.conf.erb" owner "root" group "root" - mode 0644 + mode "644" variables new_resource.to_hash end end action :delete do - service "mapserv-fcgi-layer-#{layer}" do - action [:stop, :disable] - end - - file "/srv/imagery/mapserver/layer-#{layer}.map" do + file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do action :delete end - systemd_service "mapserv-fcgi-#{layer}" do + file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do action :delete end - file "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do + file "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do action :delete end end def after_created + notifies :create, "imagery_site[#{site}]" notifies :restart, "service[nginx]" end