X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..acb5ea419113188317bc7bede334b90e12efd5ce:/cookbooks/imagery/resources/layer.rb?ds=inline diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index b4cd0d5fd..dc1fd51bb 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -1,8 +1,8 @@ # -# 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. @@ -19,12 +19,14 @@ 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 :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" @@ -37,14 +39,14 @@ property :extension, String, :default => "png" property :max_zoom, Integer, :default => 18 property :url_aliases, [String, Array], :default => [] property :revision, Integer, :default => 0 -property :overlay, [TrueClass, FalseClass], :default => false -property :default_layer, [TrueClass, FalseClass], :default => false +property :overlay, [true, false], :default => false +property :default_layer, [true, false], :default => false action :create do file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do owner "root" group "root" - mode 0o644 + 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", @@ -59,43 +61,14 @@ action :create do source "mapserver.map.erb" owner "root" group "root" - mode 0o644 + mode "644" variables new_resource.to_hash end - systemd_service "mapserv-fcgi-#{new_resource.layer}" do - description "Map server for #{new_resource.layer} layer" - environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{new_resource.layer}.map", - "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/", - "MS_DEBUGLEVEL" => "0", - "MS_ERRORFILE" => "stderr" - limit_nofile 16384 - user "imagery" - group "imagery" - exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket" - exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.layer}.pid -- /usr/bin/multiwatch -f 6 --signal=TERM -- /usr/lib/cgi-bin/mapserv" - private_tmp true - private_devices true - private_network true - protect_system "full" - protect_home true - no_new_privileges true - restart "always" - pid_file "/run/mapserver-fastcgi/layer-#{new_resource.layer}.pid" - end - - service "mapserv-fcgi-#{new_resource.layer}" do - provider Chef::Provider::Service::Systemd - action [:enable, :start] - supports :status => true, :restart => true, :reload => false - subscribes :restart, "template[/srv/imagery/mapserver/layer-#{new_resource.layer}.map]" - subscribes :restart, "systemd_service[mapserv-fcgi-#{new_resource.layer}]" - end - directory "/srv/imagery/nginx/#{new_resource.site}" do owner "root" group "root" - mode 0o755 + mode "755" recursive true end @@ -104,7 +77,7 @@ action :create do source "nginx_imagery_layer_fragment.conf.erb" owner "root" group "root" - mode 0o644 + mode "644" variables new_resource.to_hash end end @@ -114,18 +87,10 @@ action :delete do action :delete end - service "mapserv-fcgi-layer-#{new_resource.layer}" do - action [:stop, :disable] - end - file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do action :delete end - systemd_service "mapserv-fcgi-#{new_resource.layer}" do - action :delete - end - file "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do action :delete end @@ -133,5 +98,5 @@ end def after_created notifies :create, "imagery_site[#{site}]" - notifies :reload, "service[nginx]" + notifies :restart, "service[nginx]" end