Merge remote-tracking branch 'github/pull/297'

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index b959804f1f5477a74cdaba1607c6d2559f0cdd39..961216f9d8b1a5e27404560003578e1d8991e4af 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -82,7 +82,7 @@ end
 nginx_site "default" do
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"
-  restart_nginx false
+  reload_nginx false
 end
 
 systemd_tmpfile "/run/mapserver-fastcgi" do

diff --git a/cookbooks/imagery/recipes/lu_lidar_hillshade.rb b/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
index 6ca240fa35ed6fa5aa022dc1314cf70df76310be..630d683c4f53b146fd8ebb36a31eaa42d01a7ca3 100644 (file)
--- a/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
+++ b/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
@@ -26,12 +26,7 @@ end
 
 imagery_layer "lidar_hillshade_2019" do
   site "lidar-hillshade-2019.openstreetmap.lu"
-  default_layer true
-  projection "EPSG:3857"
-  source "/data/imagery/lu/lidar-hillshade/lu-lidar-2019-epsg3857.tif"
-  max_zoom 21
-  title "Lidar Hillshading"
-  copyright '&copy; 2019 <a href="https://data.public.lu/fr/datasets/lidar-2019-releve-3d-du-territoire-luxembourgeois">Administration du Cadastre et de la Topographie Luxembourg</a>, CC0'
+  action :delete
 end
 
 imagery_layer "vdl_light6" do
@@ -51,9 +46,15 @@ end
 
 imagery_layer "vdl_light6_deflate" do
   site "lidar-hillshade-2019.openstreetmap.lu"
+  action :delete
+end
+
+imagery_layer "mappers_delight_lidar_hillshade_2019" do
+  site "lidar-hillshade-2019.openstreetmap.lu"
+  default_layer true
   projection "EPSG:3857"
-  source "/data/imagery/lu/lidar-hillshade/lidar-test-vdl-light6-3857-deflate.tiff"
+  source "/data/imagery/lu/lidar-hillshade/lu_hillshade_2019-compress-epsg3857.tif"
   max_zoom 22
-  title "Lidar Hillshading Light6 test VdL"
+  title "OpenStreetMap.lu Mapper's Delight 2019 Lidar Hillshading"
   copyright '&copy; 2019 <a href="https://data.public.lu/fr/datasets/lidar-2019-releve-3d-du-territoire-luxembourgeois">Administration du Cadastre et de la Topographie Luxembourg</a>, CC0'
-end
+end
\ No newline at end of file

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index b9cd7ece95efaf01d2139e4519faec82fea0125d..dc819ebf99fd6c190af551bca00bd962664bb105 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -137,7 +137,7 @@ action :create do
   nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{new_resource.site}"
-    restart_nginx false
+    reload_nginx false
     variables new_resource.to_hash
   end
 end

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index 3c47d3091ebfd5b6fc76ccb2b2b5f73f9eeafd4b..8ac81adcff402ca4401c815646b7a90cc5a5cec5 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -24,7 +24,7 @@ property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :template, :kind_of => String, :required => true
 property :variables, :kind_of => Hash, :default => {}
-property :restart_nginx, :kind_of => [TrueClass, FalseClass], :default => true
+property :reload_nginx, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
   declare_resource :template, conf_path do
@@ -54,5 +54,5 @@ action_class do
 end
 
 def after_created
-  notifies :restart, "service[nginx]" if restart_nginx
+  notifies :reload, "service[nginx]" if reload_nginx
 end