X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/16b6ac68b262c9585e11c331b3daa88406e3f48d..481864ed956365260fa7ae05ac18248ae168f4cd:/cookbooks/imagery/resources/layer.rb diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index 3548d72fc..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,12 +17,17 @@ # limitations under the License. # +require "yaml" + +unified_mode true + default_action :create -property :name, String +property :layer, String, :name_property => true property :site, String, :required => true -property :source, String, :required => true -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 @@ -30,73 +35,68 @@ property :extent, 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, Integer, :default => 18 +property :url_aliases, [String, Array], :default => [] +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-#{name}.map" do - cookbook "imagery" - source "mapserver.map.erb" + file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do owner "root" group "root" - mode 0644 - variables new_resource.to_hash + 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 "/etc/init/mapserv-fgi-layer-#{name}.conf" do + template "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do cookbook "imagery" - source "mapserv_fcgi.conf.erb" + source "mapserver.map.erb" owner "root" group "root" - mode 0644 + mode "644" variables new_resource.to_hash end - service "mapserv-fgi-layer-#{name}.conf" do - provider Chef::Provider::Service::Upstart - action [:enable, :start] - supports :status => true, :restart => true, :reload => false - subscribes :restart, "template[/srv/imagery/mapserver/layer-#{name}.map]" - subscribes :restart, "template[/etc/init/mapserv-fgi-layer-#{name}.conf]" - 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-#{name}.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 - notifies :reload, "service[nginx]", :delayed end end action :delete do - service "mapserv-fgi-layer-#{name}.conf" do - provider Chef::Provider::Service::Upstart - action [:stop, :disable] - supports :status => true, :restart => true, :reload => false - end - - file "/srv/imagery/mapserver/layer-#{name}.map" do + file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do action :delete end - file "/etc/init/mapserv-fgi-layer-#{name}.conf" do + file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do action :delete end - file "/srv/imagery/nginx/#{site}/layer-#{name}.conf" do + file "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do action :delete - notifies :reload, "service[nginx]", :delayed end end + +def after_created + notifies :create, "imagery_site[#{site}]" + notifies :restart, "service[nginx]" +end