Switch to using upstream builds for prometheus and alertmanager

[chef.git] / cookbooks / imagery / recipes / default.rb

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 961216f9d8b1a5e27404560003578e1d8991e4af..7a5b55057133e6ac3ed94e0dfbae56e093c50324 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -49,21 +49,21 @@ package %w[
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
 directory "/srv/imagery/common" do
   owner "root"
   group "root"
   recursive true
 end
 
 directory "/srv/imagery/common" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
 directory "/srv/imagery/common/ostn02-ntv2-data" do
   owner "root"
   group "root"
   recursive true
 end
 
 directory "/srv/imagery/common/ostn02-ntv2-data" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do


@@ -71,10 +71,9 @@ remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
   not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
 
   not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
 

-execute "unzip-ostn02-ntv2-data" do
-  command "unzip -q #{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip"
-  cwd "/srv/imagery/common/ostn02-ntv2-data"
-  user "root"
+archive_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
+  destination "/srv/imagery/common/ostn02-ntv2-data"
+  owner "root"

   group "root"
   not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
   group "root"
   not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end


@@ -82,7 +81,6 @@ end
 nginx_site "default" do
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"
 nginx_site "default" do
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"

-  reload_nginx false

 end
 
 systemd_tmpfile "/run/mapserver-fastcgi" do
 end
 
 systemd_tmpfile "/run/mapserver-fastcgi" do