Switch main web site to letsencrypt

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index b9fb548c35f794619108cad79b1fba72edd9f0ad..b1e7cc9d11f1d7d19d1ad4e5237e73d7773958f3 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -34,9 +34,9 @@ property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"
-property :max_zoom, Fixnum, :default => 18
+property :max_zoom, Integer, :default => 18
 property :url_aliases, [String, Array], :default => []
-property :revision, Fixnum, :default => 0
+property :revision, Integer, :default => 0
 property :overlay, [TrueClass, FalseClass], :default => false
 property :default_layer, [TrueClass, FalseClass], :default => false
 
@@ -44,10 +44,10 @@ action :create do
   file "/srv/imagery/layers/#{site}/#{layer}.yml" do
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     content YAML.dump(:name => layer,
                       :title => title || layer,
-                      :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :url => "//{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
                       :attribution => copyright,
                       :default => default_layer,
                       :maxZoom => max_zoom,
@@ -59,7 +59,7 @@ action :create do
     source "mapserver.map.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.to_hash
   end
 
@@ -73,22 +73,24 @@ action :create do
     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"
+    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 6 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
     type "forking"
     restart "always"
   end
 
   service "mapserv-fcgi-#{layer}" do
+    provider Chef::Provider::Service::Systemd
     action [:enable, :start]
+    supports :status => true, :restart => true, :reload => false
     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
-    subscribes :restart, "systemd_service[mapserv-fcgi]"
+    subscribes :restart, "systemd_service[mapserv-fcgi-#{layer}]"
   end
 
   directory "/srv/imagery/nginx/#{site}" do
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
@@ -97,12 +99,16 @@ action :create do
     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
+  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
+    action :delete
+  end
+
   service "mapserv-fcgi-layer-#{layer}" do
     action [:stop, :disable]
   end