Minor wordsmithing

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index f8ab667319d6fcad61208bb4544b9c5a67c2b25a..4fca7bb9ad770061c9653e9818800f8ff51ab27b 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,89 +19,152 @@
 
 require "yaml"
 
 
 require "yaml"
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :name, String
-property :title, String, :required => true
+property :site, String, :name_property => 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
 
 action :create do

-  directory "/srv/#{name}" do
+  directory "/srv/#{new_resource.site}" do

     user "root"
     group "root"
     user "root"
     group "root"

-    mode 0o755
+    mode "755"

   end
 
   end
 

-  directory "/srv/imagery/layers/#{name}" do
+  directory "/srv/imagery/layers/#{new_resource.site}" do

     user "root"
     group "root"
     user "root"
     group "root"

-    mode 0o755
+    mode "755"

     recursive true
   end
 
     recursive true
   end
 

-  directory "/srv/imagery/overlays/#{name}" do
+  directory "/srv/imagery/overlays/#{new_resource.site}" do

     user "root"
     group "root"
     user "root"
     group "root"

-    mode 0o755
+    mode "755"

     recursive true
   end
 
     recursive true
   end
 

-  template "/srv/#{name}/index.html" do
+  declare_resource :template, "/srv/#{new_resource.site}/index.html" do

     source "index.html.erb"
     user "root"
     group "root"
     source "index.html.erb"
     user "root"
     group "root"

-    mode 0o644
-    variables :title => title
+    mode "644"
+    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
 
   end
 

-  cookbook_file "/srv/#{name}/imagery.css" do
+  cookbook_file "/srv/#{new_resource.site}/imagery.css" do

     source "imagery.css"
     user "root"
     group "root"
     source "imagery.css"
     user "root"
     group "root"

-    mode 0o644
+    mode "644"

   end
 
   end
 

-  cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do
+  cookbook_file "/srv/#{new_resource.site}/clientaccesspolicy.xml" do

     source "clientaccesspolicy.xml"
     user "root"
     group "root"
     source "clientaccesspolicy.xml"
     user "root"
     group "root"

-    mode 0o644
+    mode "644"

   end
 
   end
 

-  cookbook_file "/srv/#{name}/crossdomain.xml" do
+  cookbook_file "/srv/#{new_resource.site}/crossdomain.xml" do

     source "crossdomain.xml"
     user "root"
     group "root"
     source "crossdomain.xml"
     user "root"
     group "root"

-    mode 0o644
+    mode "644"

   end
 
   end
 

-  layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|
-    YAML.safe_load(::File.read(path), [Symbol])
+  layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
+    YAML.safe_load(::File.read(path), :permitted_classes => [Symbol])

   end
 
   end
 

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

     source "imagery.js.erb"
     user "root"
     group "root"
     source "imagery.js.erb"
     user "root"
     group "root"

-    mode 0o644
-    variables :bbox => bbox, :layers => layers
+    mode "644"
+    variables :bbox => new_resource.bbox, :layers => layers

   end
 
   end
 

-  base_domains = [name] + Array(aliases)
+  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" => "512"
+    limit_nofile 16384
+    memory_high "1G"
+    memory_max "4G"
+    user "imagery"
+    group "imagery"
+    exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
+    standard_input "socket"
+    sandbox true
+    restrict_address_families "AF_UNIX"
+    # Terminate service after 30mins. Service is socket activated
+    runtime_max_sec 1800
+  end
+
+  systemd_socket "mapserv-fcgi-#{new_resource.site}" do
+    description "Map server for #{new_resource.site} layer socket"
+    socket_user "imagery"
+    socket_group "imagery"
+    listen_stream "/run/mapserver-fastcgi/layer-#{new_resource.site}.socket"
+  end
+
+  # 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}]"
+  end

 
 

-  ssl_certificate new_resource.name do
-    domains base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
+  systemd_unit "mapserv-fcgi-#{new_resource.site}.socket" do
+    action [:enable, :start]
+    subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"

   end
 
   end
 

-  nginx_site new_resource.name do
+  ssl_certificate new_resource.site do
+    domains tile_domains
+  end
+
+  nginx_site new_resource.site do

     template "nginx_imagery.conf.erb"
     template "nginx_imagery.conf.erb"

-    directory "/srv/imagery/#{name}"
-    restart_nginx false
+    directory "/srv/imagery/#{new_resource.site}"

     variables new_resource.to_hash
   end
 end
 
     variables new_resource.to_hash
   end
 end
 

+action :delete do
+  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
+
+  nginx_site new_resource.site do
+    action :delete
+  end
+end
+

 def after_created
   notifies :reload, "service[nginx]"
 end
 def after_created
   notifies :reload, "service[nginx]"
 end