X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0ade30e31708ad48458cd7e2f6604259540ace6e..5b4f815f6cd8433be1d66b8376b71452f974b225:/cookbooks/imagery/resources/layer.rb diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index 60712a635..957e46b47 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -34,9 +34,9 @@ property :background_colour, String property :resample, String, :default => "average" property :imagemode, String property :extension, String, :default => "png" -property :max_zoom, Fixnum, :default => 18 +property :max_zoom, Integer, :default => 18 property :url_aliases, [String, Array], :default => [] -property :revision, Fixnum, :default => 0 +property :revision, Integer, :default => 0 property :overlay, [TrueClass, FalseClass], :default => false property :default_layer, [TrueClass, FalseClass], :default => false @@ -47,7 +47,7 @@ action :create do mode 0o644 content YAML.dump(:name => layer, :title => title || layer, - :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png", + :url => "//{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png", :attribution => copyright, :default => default_layer, :maxZoom => max_zoom, @@ -65,18 +65,23 @@ action :create do 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/", "MS_DEBUGLEVEL" => "0", "MS_ERRORFILE" => "stderr" + limit_nofile 16384 user "imagery" group "imagery" 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 6 --signal=TERM -- /usr/lib/cgi-bin/mapserv" - pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid" - type "forking" + exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{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-#{layer}.pid" end service "mapserv-fcgi-#{layer}" do