Use https between tile caches and render servers

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 46b584e1db3214298474b6f7f95cacbcc6f250b1..2868c7f7bfec8cb3495de6580925525e86a349e8 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -34,104 +34,104 @@ property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"

-property :max_zoom, Fixnum, :default => 23
+property :max_zoom, Integer, :default => 18

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

-property :revision, Fixnum, :default => 1
+property :revision, Integer, :default => 0

 property :overlay, [TrueClass, FalseClass], :default => false
 property :default_layer, [TrueClass, FalseClass], :default => false
 
 action :create do
 property :overlay, [TrueClass, FalseClass], :default => false
 property :default_layer, [TrueClass, FalseClass], :default => false
 
 action :create do

-  file "create layer yaml definition" do
+  file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do

     owner "root"
     group "root"
     owner "root"
     group "root"

-    mode 0644
-    if new_resource.overlay
-      path "/srv/imagery/overlays/#{site}/#{layer}.yml"
-    else
-      path "/srv/imagery/layers/#{site}/#{layer}.yml"
-    end
-    content YAML.dump(:name => layer,
-                      :title => title || layer,
-                      :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
-                      :attribution => copyright,
-                      :default => default_layer,
-                      :maxZoom => max_zoom)
+    mode 0o644
+    content YAML.dump(:name => new_resource.layer,
+                      :title => new_resource.title || new_resource.layer,
+                      :url => "//{s}.#{new_resource.site}/layer/#{new_resource.layer}/{z}/{x}/{y}.png",
+                      :attribution => new_resource.copyright,
+                      :default => new_resource.default_layer,
+                      :maxZoom => new_resource.max_zoom,
+                      :overlay => new_resource.overlay)

   end
 
   end
 

-  file "remove old layer yaml" do
-    if new_resource.overlay
-      path "/srv/imagery/layers/#{site}/#{layer}.yml" # remove layer if overlay
-    else
-      path "/srv/imagery/overlays/#{site}/#{layer}.yml" # remove overlay if layer
-    end
-    action :delete
-  end
-
-  template "/srv/imagery/mapserver/layer-#{layer}.map" do
+  template "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do

     cookbook "imagery"
     source "mapserver.map.erb"
     owner "root"
     group "root"
     cookbook "imagery"
     source "mapserver.map.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables new_resource.to_hash
   end
 
     variables new_resource.to_hash
   end
 

-  systemd_service "mapserv-fcgi-#{layer}" do
-    description "Map server for #{layer} layer"
+  systemd_service "mapserv-fcgi-#{new_resource.layer}" do
+    description "Map server for #{new_resource.layer} layer"
+    environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{new_resource.layer}.map",
+                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
+                "MS_DEBUGLEVEL" => "0",
+                "MS_ERRORFILE" => "stderr"

     limit_nofile 16384
     limit_nofile 16384

-    environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
-                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"

     user "imagery"
     group "imagery"
     user "imagery"
     group "imagery"

-    exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket"
-    exec_start "/usr/bin/spawn-fcgi -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{layer}.pid -- /usr/bin/multiwatch -f 4 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
-    pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
-    type "forking"
+    exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket"
+    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.layer}.pid -- /usr/bin/multiwatch -f 6 --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"
     restart "always"

+    pid_file "/run/mapserver-fastcgi/layer-#{new_resource.layer}.pid"

   end
 
   end
 

-  service "mapserv-fcgi-#{layer}" do
+  service "mapserv-fcgi-#{new_resource.layer}" do
+    provider Chef::Provider::Service::Systemd

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

-    subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
-    subscribes :restart, "systemd_service[mapserv-fcgi]"
+    supports :status => true, :restart => true, :reload => false
+    subscribes :restart, "template[/srv/imagery/mapserver/layer-#{new_resource.layer}.map]"
+    subscribes :restart, "systemd_service[mapserv-fcgi-#{new_resource.layer}]"

   end
 
   end
 

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

     owner "root"
     group "root"
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

     recursive true
   end
 
     recursive true
   end
 

-  template "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do
+  template "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do

     cookbook "imagery"
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"
     cookbook "imagery"
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

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

-  service "mapserv-fcgi-layer-#{layer}" do
+  file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do
+    action :delete
+  end
+
+  service "mapserv-fcgi-layer-#{new_resource.layer}" do

     action [:stop, :disable]
   end
 
     action [:stop, :disable]
   end
 

-  file "/srv/imagery/mapserver/layer-#{layer}.map" do
+  file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do

     action :delete
   end
 
     action :delete
   end
 

-  systemd_service "mapserv-fcgi-#{layer}" do
+  systemd_service "mapserv-fcgi-#{new_resource.layer}" do

     action :delete
   end
 
     action :delete
   end
 

-  file "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do
+  file "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do

     action :delete
   end
 end
 
 def after_created
   notifies :create, "imagery_site[#{site}]"
     action :delete
   end
 end
 
 def after_created
   notifies :create, "imagery_site[#{site}]"

-  notifies :restart, "service[nginx]"
+  notifies :reload, "service[nginx]"

 end
 end