X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/86dd0e99c6342b5dc6a236ba1da80ad18c8f3aab..df246797e4b8705a0912158c7aa46e4da3138e01:/cookbooks/imagery/resources/site.rb diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index dc819ebf9..711ae3e50 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -30,20 +30,20 @@ action :create do directory "/srv/#{new_resource.site}" do user "root" group "root" - mode 0o755 + mode "755" end directory "/srv/imagery/layers/#{new_resource.site}" do user "root" group "root" - mode 0o755 + mode "755" recursive true end directory "/srv/imagery/overlays/#{new_resource.site}" do user "root" group "root" - mode 0o755 + mode "755" recursive true end @@ -51,7 +51,7 @@ action :create do source "index.html.erb" user "root" group "root" - mode 0o644 + mode "644" variables :title => new_resource.title end @@ -59,28 +59,28 @@ action :create do source "robots.txt" user "root" group "root" - mode 0o644 + mode "644" end cookbook_file "/srv/#{new_resource.site}/imagery.css" do source "imagery.css" user "root" group "root" - mode 0o644 + mode "644" end cookbook_file "/srv/#{new_resource.site}/clientaccesspolicy.xml" do source "clientaccesspolicy.xml" user "root" group "root" - mode 0o644 + mode "644" end cookbook_file "/srv/#{new_resource.site}/crossdomain.xml" do source "crossdomain.xml" user "root" group "root" - mode 0o644 + mode "644" end layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path| @@ -91,7 +91,7 @@ action :create do source "imagery.js.erb" user "root" group "root" - mode 0o644 + mode "644" variables :bbox => new_resource.bbox, :layers => layers end @@ -106,7 +106,7 @@ action :create do "MS_ERRORFILE" => "stderr", "GDAL_CACHEMAX" => "512" limit_nofile 16384 - limit_cpu 60 + limit_cpu 180 memory_max "4G" user "imagery" group "imagery" @@ -137,7 +137,6 @@ action :create do nginx_site new_resource.site do template "nginx_imagery.conf.erb" directory "/srv/imagery/#{new_resource.site}" - reload_nginx false variables new_resource.to_hash end end