imagery: remove mapserver service restrictions

[chef.git] / cookbooks / imagery / resources / site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 11bb8b6465ab4d2ef89f106a35f8bc0804e24096..856159be9b80c4efa1914253c069f564dfe066e0 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -27,6 +27,7 @@ property :site, String, :name_property => true
 property :title, String, :required => [:create]
 property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => [:create]
 property :title, String, :required => [:create]
 property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => [:create]

+property :uses_tiler, [true, false], :default => false

 
 action :create do
   directory "/srv/#{new_resource.site}" do
 
 action :create do
   directory "/srv/#{new_resource.site}" do


@@ -86,7 +87,7 @@ action :create do
   end
 
   layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
   end
 
   layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|

-    YAML.safe_load(::File.read(path), [Symbol])
+    YAML.safe_load(::File.read(path), :permitted_classes => [Symbol])

   end
 
   declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do
   end
 
   declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do


@@ -102,23 +103,17 @@ action :create do
 
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     description "Map server for #{new_resource.site} layer"
 
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     description "Map server for #{new_resource.site} layer"

-    environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
-                "MS_DEBUGLEVEL" => "0",
+    environment "MS_DEBUGLEVEL" => "0",

                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384

-    memory_high "512M"
-    memory_max "1G"

     user "imagery"
     group "imagery"
     user "imagery"
     group "imagery"

-    exec_start "/usr/lib/cgi-bin/mapserv"
+    exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"

     standard_input "socket"
     standard_input "socket"

-    private_tmp true
-    private_devices true
-    private_network true
-    protect_system "full"
-    protect_home true
-    no_new_privileges true
+    sandbox true
+    restrict_address_families "AF_UNIX"
+    not_if { new_resource.uses_tiler }

   end
 
   systemd_socket "mapserv-fcgi-#{new_resource.site}" do
   end
 
   systemd_socket "mapserv-fcgi-#{new_resource.site}" do


@@ -126,20 +121,22 @@ action :create do
     socket_user "imagery"
     socket_group "imagery"
     listen_stream "/run/mapserver-fastcgi/layer-#{new_resource.site}.socket"
     socket_user "imagery"
     socket_group "imagery"
     listen_stream "/run/mapserver-fastcgi/layer-#{new_resource.site}.socket"

-
+    not_if { new_resource.uses_tiler }

   end
 
   end
 

-  # Ensure service is stopped else socket cannot reload
+  # Ensure service is stopped because otherwise the socket cannot reload

   service "mapserv-fcgi-#{new_resource.site}" do
     provider Chef::Provider::Service::Systemd
     action :nothing
     subscribes :stop, "systemd_service[mapserv-fcgi-#{new_resource.site}]"
     subscribes :stop, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"
   service "mapserv-fcgi-#{new_resource.site}" do
     provider Chef::Provider::Service::Systemd
     action :nothing
     subscribes :stop, "systemd_service[mapserv-fcgi-#{new_resource.site}]"
     subscribes :stop, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"

+    not_if { new_resource.uses_tiler }

   end
 
   end
 

-  systemd_unit 'mapserv-fcgi-#{new_resource.site}.socket' do
+  systemd_unit "mapserv-fcgi-#{new_resource.site}.socket" do

     action [:enable, :start]
     subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"
     action [:enable, :start]
     subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"

+    not_if { new_resource.uses_tiler }

   end
 
   ssl_certificate new_resource.site do
   end
 
   ssl_certificate new_resource.site do


@@ -157,10 +154,12 @@ action :delete do
   service "mapserv-fcgi-#{new_resource.site}" do
     provider Chef::Provider::Service::Systemd
     action [:stop, :disable]
   service "mapserv-fcgi-#{new_resource.site}" do
     provider Chef::Provider::Service::Systemd
     action [:stop, :disable]

+    not_if { new_resource.uses_tiler }

   end
 
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     action :delete
   end
 
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     action :delete

+    not_if { new_resource.uses_tiler }

   end
 
   nginx_site new_resource.site do
   end
 
   nginx_site new_resource.site do