imagery: enable socket

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index daa517af7d23ac2fb4818fae7f44df2b738fb7a6..11bb8b6465ab4d2ef89f106a35f8bc0804e24096 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.


@@ -19,31 +19,33 @@
 
 require "yaml"
 
 
 require "yaml"
 

+unified_mode true
+

 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,7 +53,7 @@ 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
 


@@ -59,28 +61,28 @@ action :create do
     source "robots.txt"
     user "root"
     group "root"
     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"
   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"
   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|


@@ -91,7 +93,7 @@ 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
 
     variables :bbox => new_resource.bbox, :layers => layers
   end
 


@@ -105,26 +107,39 @@ action :create do
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384

-    memory_max "2G"
+    memory_high "512M"
+    memory_max "1G"

     user "imagery"
     group "imagery"
     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"
+    exec_start "/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
     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
 
   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 else socket cannot reload

   service "mapserv-fcgi-#{new_resource.site}" do
     provider Chef::Provider::Service::Systemd
   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
+
+  systemd_unit 'mapserv-fcgi-#{new_resource.site}.socket' do

     action [:enable, :start]
     action [:enable, :start]

-    supports :status => true, :restart => true, :reload => false
-    subscribes :restart, "systemd_service[mapserv-fcgi-#{new_resource.site}]"
+    subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"

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


@@ -134,13 +149,13 @@ 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
   service "mapserv-fcgi-#{new_resource.site}" do
     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
 
     action [:stop, :disable]
   end