X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1a4d5ffc47ba7efe859b6c867c136347f7bb36af..18e12b0e123fc3e5f344682f884feabc12da0f5a:/cookbooks/imagery/resources/layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index bfcfd3424..b4cd0d5fd 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -8,7 +8,7 @@
 # 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,
@@ -34,96 +34,104 @@ 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
 
 action :create do
-  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
+  file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.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)
+    mode 0o644
+    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
 
-  file "remove old overlay yaml" do
-    path "/srv/imagery/overlays/#{site}/#{layer}.yml"
-    action :delete
-  end
-
-  template "/srv/imagery/mapserver/layer-#{layer}.map" do
+  template "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do
     cookbook "imagery"
     source "mapserver.map.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.to_hash
   end
 
-  systemd_service "mapserv-fcgi-#{layer}" do
-    description "Map server for #{layer} layer"
+  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
-    environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
-                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"
     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 4 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
-    pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
-    type "forking"
+    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-#{layer}" do
+  service "mapserv-fcgi-#{new_resource.layer}" do
+    provider Chef::Provider::Service::Systemd
     action [:enable, :start]
-    subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
-    subscribes :restart, "systemd_service[mapserv-fcgi]"
+    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/#{site}" do
+  directory "/srv/imagery/nginx/#{new_resource.site}" do
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     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 0o644
     variables new_resource.to_hash
   end
 end
 
 action :delete do
-  service "mapserv-fcgi-layer-#{layer}" do
+  file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do
+    action :delete
+  end
+
+  service "mapserv-fcgi-layer-#{new_resource.layer}" do
     action [:stop, :disable]
   end
 
-  file "/srv/imagery/mapserver/layer-#{layer}.map" do
+  file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do
     action :delete
   end
 
-  systemd_service "mapserv-fcgi-#{layer}" do
+  systemd_service "mapserv-fcgi-#{new_resource.layer}" 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]"
+  notifies :reload, "service[nginx]"
 end