Update default SSL cipher list and remove tilecache override

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 210439b054083eceafef3f809893fd1b3d26d6be..930d089190570af873788d633fd18e0a119555c0 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -17,13 +17,15 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+require "yaml"
+

 default_action :create
 
 property :layer, String, :name_property => true
 property :site, String, :required => true
 property :source, String, :required => true
 property :root_layer, [TrueClass, FalseClass], :default => false
 default_action :create
 
 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 :title, String

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


@@ -32,17 +34,32 @@ 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, Fixnum, :default => 18

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

-property :revision, Fixnum, :default => 1
+property :revision, Fixnum, :default => 0
+property :overlay, [TrueClass, FalseClass], :default => false
+property :default_layer, [TrueClass, FalseClass], :default => false

 
 action :create do
 
 action :create do

+  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
+    owner "root"
+    group "root"
+    mode 0o644
+    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,
+                      :overlay => overlay)
+  end
+

   template "/srv/imagery/mapserver/layer-#{layer}.map" do
     cookbook "imagery"
     source "mapserver.map.erb"
     owner "root"
     group "root"
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
     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
 


@@ -51,24 +68,29 @@ action :create do
     limit_nofile 16384
     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
                 "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
     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"
+                "MS_DEBUGLEVEL" => "0",
+                "MS_ERRORFILE" => "stderr"

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

-    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -- /usr/bin/multiwatch -f 4 -- /usr/lib/cgi-bin/mapserv"
-    restart "on-failure"
+    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
   end
 
   service "mapserv-fcgi-#{layer}" do

+    provider Chef::Provider::Service::Systemd

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

+    supports :status => true, :restart => true, :reload => false

     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
     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"
   end
 
   directory "/srv/imagery/nginx/#{site}" do
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

     recursive true
   end
 
     recursive true
   end
 


@@ -77,7 +99,7 @@ action :create do
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables new_resource.to_hash
   end
 end
     variables new_resource.to_hash
   end
 end


@@ -101,5 +123,6 @@ action :delete do
 end
 
 def after_created
 end
 
 def after_created

-  notifies :restart, "service[nginx]"
+  notifies :create, "imagery_site[#{site}]"
+  notifies :reload, "service[nginx]"

 end
 end