rsync: do not compress xz and pbf files

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index ede9b5d478479dc35e63b214e742a3379c9f485c..5b457e8557ed5a1dc6d55c51a0725594219ed9bd 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -63,36 +63,14 @@ action :create do
     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",
-                "GDAL_CACHEMAX" => "128"
-    limit_nofile 16384
-    memory_high "512M"
-    memory_max "2G"
-    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 -b 8192 -s /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.layer}.pid -- /usr/bin/multiwatch -f 4 --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"
+  # Disable legacy service
+  service "mapserv-fcgi-#{new_resource.layer}" do
+    action [:stop, :disable]
   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}]"
+  # Remove legacy service
+  systemd_service "mapserv-fcgi-#{new_resource.layer}" do
+    action :delete
   end
 
   directory "/srv/imagery/nginx/#{new_resource.site}" do
@@ -137,4 +115,5 @@ end
 def after_created
   notifies :create, "imagery_site[#{site}]"
   notifies :reload, "service[nginx]"
+  # notifies :restart, "service[mapserv-fcgi-#{site}]"
 end