X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/90a349e0bc558441e65156eabb585c578d93fbfd..d25969b064e5895c07e617a4457238d12d8093ff:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index d6e2071cc..6cfea3ea4 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # 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,
@@ -19,91 +19,154 @@
 
 require "yaml"
 
+unified_mode true
+
 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 :bbox, Array, :required => true
+property :bbox, Array, :required => [:create]
 
 action :create do
-  directory "/srv/#{name}" do
+  directory "/srv/#{new_resource.site}" do
     user "root"
     group "root"
-    mode 0o755
+    mode "755"
   end
 
-  directory "/srv/imagery/layers/#{name}" do
+  directory "/srv/imagery/layers/#{new_resource.site}" do
     user "root"
     group "root"
-    mode 0o755
+    mode "755"
     recursive true
   end
 
-  directory "/srv/imagery/overlays/#{name}" do
+  directory "/srv/imagery/overlays/#{new_resource.site}" do
     user "root"
     group "root"
-    mode 0o755
+    mode "755"
     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"
-    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
 
-  cookbook_file "/srv/#{name}/imagery.css" do
+  cookbook_file "/srv/#{new_resource.site}/imagery.css" do
     source "imagery.css"
     user "root"
     group "root"
-    mode 0o644
+    mode "644"
   end
 
-  cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do
+  cookbook_file "/srv/#{new_resource.site}/clientaccesspolicy.xml" do
     source "clientaccesspolicy.xml"
     user "root"
     group "root"
-    mode 0o644
+    mode "644"
   end
 
-  cookbook_file "/srv/#{name}/crossdomain.xml" do
+  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/#{name}/*.yml").collect do |path|
+  layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
     YAML.safe_load(::File.read(path), [Symbol])
   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"
-    mode 0o644
-    variables :bbox => bbox, :layers => layers
+    mode "644"
+    variables :bbox => new_resource.bbox, :layers => layers
   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}"] }
 
-  ssl_certificate new_resource.name do
-    domains tile_domains
+  # FIXME Clean up old service
+  service "mapserv-fcgi-#{new_resource.site}@" do
+    provider Chef::Provider::Service::Systemd
+    action [:stop, :disable]
+  end
+
+  # FIXME Clean up old service
+  systemd_service "mapserv-fcgi-#{new_resource.site}@" do
+    action :delete
+  end
+
+  systemd_service "mapserv-fcgi-#{new_resource.site}@" do
+    description "Map server for #{new_resource.site} layer"
+    environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
+                "=" => "0",
+                "MS_ERRORFILE" => "stderr",
+                "GDAL_CACHEMAX" => "512"
+    limit_nofile 16384
+    memory_high "512M"
+    memory_max "1G"
+    user "imagery"
+    group "imagery"
+    exec_start "/usr/bin/multiwatch -f 4 -- /usr/lib/cgi-bin/mapserv"
+    standard_input "socket"
+    private_tmp true
+    private_devices true
+    private_network true
+    protect_system "full"
+    protect_home true
+    no_new_privileges true
+  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
+
+  systemd_unit "mapserv-fcgi-#{new_resource.site}.socket" do
+    action [:enable, :start]
+    subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"
   end
 
-  resolvers = node[:networking][:nameservers].map do |resolver|
-    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
+  ssl_certificate new_resource.site do
+    domains tile_domains
   end
 
-  nginx_site new_resource.name do
+  nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
-    directory "/srv/imagery/#{name}"
-    restart_nginx false
-    variables new_resource.to_hash.merge(:resolvers => resolvers)
+    directory "/srv/imagery/#{new_resource.site}"
+    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