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 8c98e5ddbd4b60a274cf2d6a11dc721632bccbce..930d089190570af873788d633fd18e0a119555c0 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -36,35 +36,22 @@ property :imagemode, String
 property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 18
 property :url_aliases, [String, Array], :default => []
 property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 18
 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
 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/#{site}/#{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
+    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,
     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)
-  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
+                      :maxZoom => max_zoom,
+                      :overlay => overlay)

   end
 
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
   end
 
   template "/srv/imagery/mapserver/layer-#{layer}.map" do


@@ -72,7 +59,7 @@ action :create do
     source "mapserver.map.erb"
     owner "root"
     group "root"
     source "mapserver.map.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables new_resource.to_hash
   end
 
     variables new_resource.to_hash
   end
 


@@ -80,26 +67,30 @@ action :create do
     description "Map server for #{layer} layer"
     limit_nofile 16384
     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
     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_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"
     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
     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]
     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
 


@@ -108,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


@@ -133,5 +124,5 @@ end
 
 def after_created
   notifies :create, "imagery_site[#{site}]"
 
 def after_created
   notifies :create, "imagery_site[#{site}]"

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

 end
 end