imagery: fix nginx listen

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 9356a77a47767ebd03f6935ddf8f42b9f7d397e4..b1e7cc9d11f1d7d19d1ad4e5237e73d7773958f3 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -17,46 +17,116 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+require "yaml"
+

 default_action :create
 
 default_action :create
 

-property :name, String
+property :layer, String, :name_property => true

 property :site, String, :required => true
 property :source, String, :required => true
 property :site, String, :required => true
 property :source, String, :required => true

-property :text, String
-property :copyright, String, :default =>  "Copyright"
+property :root_layer, [TrueClass, FalseClass], :default => false
+property :title, String
+property :copyright, String, :default => "Copyright"

 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :extent, String
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :extent, String

-property :background, String
-property :resample, String, :default =>  "average"
+property :background_colour, String
+property :resample, String, :default => "average"

 property :imagemode, String
 property :imagemode, String

-property :extension, String
-property :max_zoom, Fixnum, :default =>  23
+property :extension, String, :default => "png"
+property :max_zoom, Integer, :default => 18
+property :url_aliases, [String, Array], :default => []
+property :revision, Integer, :default => 0
+property :overlay, [TrueClass, FalseClass], :default => false
+property :default_layer, [TrueClass, FalseClass], :default => false

 
 action :create do
 
 action :create do

-  template "/srv/imagery/mapserver/layer-#{name}.map" do
+  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
+    owner "root"
+    group "root"
+    mode 0o644
+    content YAML.dump(:name => layer,
+                      :title => title || layer,
+                      :url => "//{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :attribution => copyright,
+                      :default => default_layer,
+                      :maxZoom => max_zoom,
+                      :overlay => overlay)
+  end
+
+  template "/srv/imagery/mapserver/layer-#{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
 

-  template "/etc/init/mapserv-fgi-layer-#{name}.conf" do
+  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_DEBUGLEVEL" => "0",
+                "MS_ERRORFILE" => "stderr"
+    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 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-#{layer}]"
+  end
+
+  directory "/srv/imagery/nginx/#{site}" do
+    owner "root"
+    group "root"
+    mode 0o755
+    recursive true
+  end
+
+  template "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do

     cookbook "imagery"
     cookbook "imagery"

-    source "mapserv_fcgi.conf.erb"
+    source "nginx_imagery_layer_fragment.conf.erb"

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

-    mode 0644
+    mode 0o644

     variables new_resource.to_hash
   end
     variables new_resource.to_hash
   end

+end

 
 

-  service "mapserv-fgi-layer-#{name}.conf" do
-    provider Chef::Provider::Service::Upstart
-    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]"
+action :delete do
+  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
+    action :delete
+  end
+
+  service "mapserv-fcgi-layer-#{layer}" do
+    action [:stop, :disable]
+  end
+
+  file "/srv/imagery/mapserver/layer-#{layer}.map" do
+    action :delete
+  end
+
+  systemd_service "mapserv-fcgi-#{layer}" do
+    action :delete

   end
   end

+
+  file "/srv/imagery/nginx/#{site}/layer-#{layer}.conf" do
+    action :delete
+  end
+end
+
+def after_created
+  notifies :create, "imagery_site[#{site}]"
+  notifies :reload, "service[nginx]"

 end
 end