Bump cookstyle from 6.21.1 to 7.0.0

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 8cb951389951cbf172fe22d3d98186cc169f5a9f..50bfd24b8fd2dcc914f05d73ed3af0145ef3b3ee 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: imagery
+# Cookbook:: imagery

 # Resource:: imagery_site
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -22,28 +22,28 @@ require "yaml"
 default_action :create
 
 property :site, String, :name_property => true
 default_action :create
 
 property :site, String, :name_property => true

-property :title, String, :required => true
+property :title, String, :required => [:create]

 property :aliases, [String, Array], :default => []
 property :aliases, [String, Array], :default => []

-property :bbox, Array, :required => true
+property :bbox, Array, :required => [:create]

 
 action :create do
   directory "/srv/#{new_resource.site}" do
     user "root"
     group "root"
 
 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"
   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"
     recursive true
   end
 
   directory "/srv/imagery/overlays/#{new_resource.site}" do
     user "root"
     group "root"

-    mode 0o755
+    mode "755"

     recursive true
   end
 
     recursive true
   end
 


@@ -51,29 +51,36 @@ action :create do
     source "index.html.erb"
     user "root"
     group "root"
     source "index.html.erb"
     user "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :title => new_resource.title
   end
 
     variables :title => new_resource.title
   end
 

+  cookbook_file "/srv/#{new_resource.site}/robots.txt" do
+    source "robots.txt"
+    user "root"
+    group "root"
+    mode "644"
+  end
+

   cookbook_file "/srv/#{new_resource.site}/imagery.css" do
     source "imagery.css"
     user "root"
     group "root"
   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"
   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"
   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|
   end
 
   layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|


@@ -84,41 +91,43 @@ action :create do
     source "imagery.js.erb"
     user "root"
     group "root"
     source "imagery.js.erb"
     user "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :bbox => new_resource.bbox, :layers => layers
   end
 
   base_domains = [new_resource.site] + Array(new_resource.aliases)
   tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
 
     variables :bbox => new_resource.bbox, :layers => layers
   end
 
   base_domains = [new_resource.site] + Array(new_resource.aliases)
   tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
 

-  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",
-                "MS_ERRORFILE" => "stderr",
-                "GDAL_CACHEMAX" => "128"
-    limit_nofile 16384
-    memory_high "512M"
-    memory_max "1G"
-    user "imagery"
-    group "imagery"
-    exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}.socket"
-    exec_start "/usr/bin/spawn-fcgi -n -b 8192 -s /run/mapserver-fastcgi/layer-#{new_resource.site}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.site}.pid -- /usr/bin/multiwatch -f 8 --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.site}.pid"
-  end
-
-  service "mapserv-fcgi-#{new_resource.site}" do
-    provider Chef::Provider::Service::Systemd
-    action [:enable, :start]
-    supports :status => true, :restart => true, :reload => false
-    subscribes :restart, "systemd_service[mapserv-fcgi-#{new_resource.site}]"
+  %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"
+      environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
+                  "MS_DEBUGLEVEL" => "0",
+                  "MS_ERRORFILE" => "stderr",
+                  "GDAL_CACHEMAX" => "512"
+      limit_nofile 16384
+      limit_cpu 180
+      memory_max "4G"
+      user "imagery"
+      group "imagery"
+      exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.socket"
+      exec_start "/usr/bin/spawn-fcgi -n -b 8192 -s /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.pid -- /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.site}-#{index}.pid"
+    end
+
+    service "mapserv-fcgi-#{new_resource.site}-#{index}" do
+      provider Chef::Provider::Service::Systemd
+      action [:enable, :start]
+      supports :status => true, :restart => true, :reload => false
+      subscribes :restart, "systemd_service[mapserv-fcgi-#{new_resource.site}-#{index}]"
+    end

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


@@ -128,18 +137,20 @@ action :create do
   nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{new_resource.site}"
   nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{new_resource.site}"

-    restart_nginx false

     variables new_resource.to_hash
   end
 end
 
 action :delete do
     variables new_resource.to_hash
   end
 end
 
 action :delete do

-  service "mapserv-fcgi-#{new_resource.site}" do
-    action [:stop, :disable]
-  end
-
-  systemd_service "mapserv-fcgi-#{new_resource.site}" do
-    action :delete
+  %w[0 1 2 3 4 5 6 7].each do |index|
+    service "mapserv-fcgi-#{new_resource.site}-#{index}" do
+      provider Chef::Provider::Service::Systemd
+      action [:stop, :disable]
+    end
+
+    systemd_service "mapserv-fcgi-#{new_resource.site}-#{index}" do
+      action :delete
+    end

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