X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7a934ef4aaf32d97f15e62b253d3945baf9ea5bb..5216dd84be820f69e4c1503986a94664a2ee0ba6:/cookbooks/imagery/resources/layer.rb?ds=sidebyside

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 648ac06d6..e60ed7619 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -19,22 +19,25 @@
 
 default_action :create
 
-property :name, String
+property :layer, String, :name_property => true
 property :site, String, :required => true
 property :source, String, :required => true
+property :root_layer, [TrueClass, FalseClass], :default => false
 property :text, String
 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :extent, String
-property :background, String
+property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
-property :extension, String
+property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 23
+property :url_aliases, [String, Array], :default => []
+property :revision, Fixnum, :default => 1
 
 action :create do
-  template "/srv/imagery/mapserver/layer-#{name}.map" do
+  template "/srv/imagery/mapserver/layer-#{layer}.map" do
     cookbook "imagery"
     source "mapserver.map.erb"
     owner "root"
@@ -43,21 +46,23 @@ action :create do
     variables new_resource.to_hash
   end
 
-  template "/etc/init/mapserv-fgi-layer-#{name}.conf" do
-    cookbook "imagery"
-    source "mapserv_fcgi.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    variables new_resource.to_hash
+  systemd_service "mapserv-fcgi-#{layer}" do
+    description "Map server for #{layer} layer"
+    limit_nofile 16384
+    environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
+                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
+                "MS_ERRORFILE" => "/tmp/mapserver-layer-#{layer}.log",
+                "MS_DEBUGLEVEL" => "1"
+    user "imagery"
+    group "imagery"
+    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -f /usr/lib/cgi-bin/mapserv"
+    restart "on-failure"
   end
 
-  service "mapserv-fgi-layer-#{name}.conf" do
-    provider Chef::Provider::Service::Upstart
+  service "mapserv-fcgi-#{layer}" do
     action [:enable, :start]
-    supports :status => true, :restart => true, :reload => false
-    subscribes :restart, "template[/srv/imagery/mapserver/layer-#{name}.map]"
-    subscribes :restart, "template[/etc/init/mapserv-fgi-layer-#{name}.conf]"
+    subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
+    subscribes :restart, "systemd_service[mapserv-fcgi]"
   end
 
   directory "/srv/imagery/nginx/#{site}" do
@@ -67,35 +72,34 @@ action :create do
     recursive true
   end
 
-  template "/srv/imagery/nginx/#{site}/layer-#{name}.conf" do
+  template "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do
     cookbook "imagery"
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"
     mode 0644
     variables new_resource.to_hash
-    notifies :reload, "service[nginx]", :delayed
   end
-
 end
 
 action :delete do
-  service "mapserv-fgi-layer-#{name}.conf" do
-    provider Chef::Provider::Service::Upstart
+  service "mapserv-fcgi-layer-#{layer}" do
     action [:stop, :disable]
-    supports :status => true, :restart => true, :reload => false
   end
 
-  file "/srv/imagery/mapserver/layer-#{name}.map" do
+  file "/srv/imagery/mapserver/layer-#{layer}.map" do
     action :delete
   end
 
-  file "/etc/init/mapserv-fgi-layer-#{name}.conf" do
+  systemd_service "mapserv-fcgi-#{layer}" do
     action :delete
   end
 
-  file "/srv/imagery/nginx/#{site}/layer-#{name}.conf" do
+  file "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do
     action :delete
-    notifies :reload, "service[nginx]", :delayed
   end
 end
+
+def after_created
+  notifies :restart, "service[nginx]"
+end