X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d45bc53eef2534330416e79e547c1b5f3dca60ff..c9bac0802fe6ca5a21d8038a71973f1992610a79:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 53c954e8d..d48380384 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: imagery
+# Cookbook:: imagery
 # Resource:: imagery_site
 #
-# 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.
@@ -98,15 +98,6 @@ action :create do
   base_domains = [new_resource.site] + Array(new_resource.aliases)
   tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
 
-  service "mapserv-fcgi-#{new_resource.site}" do
-    provider Chef::Provider::Service::Systemd
-    action [:stop, :disable]
-  end
-
-  systemd_service "mapserv-fcgi-#{new_resource.site}" do
-    action :delete
-  end
-
   %w[0 1 2 3 4 5 6 7].each do |index|
     systemd_service "mapserv-fcgi-#{new_resource.site}-#{index}" do
       description "Map server for #{new_resource.site} layer"
@@ -115,7 +106,8 @@ action :create do
                   "MS_ERRORFILE" => "stderr",
                   "GDAL_CACHEMAX" => "512"
       limit_nofile 16384
-      memory_max "2G"
+      limit_cpu 60
+      memory_max "4G"
       user "imagery"
       group "imagery"
       exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.socket"