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 d7827173b068910619de31c7db4405e9888707a3..7a5b55057133e6ac3ed94e0dfbae56e093c50324 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: imagery
+# Cookbook:: imagery

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -22,60 +22,65 @@ include_recipe "git"
 
 # Imagery gdal Requirements
 package "gdal-bin"
 
 # Imagery gdal Requirements
 package "gdal-bin"

-package "python-gdal"
+# python-gdal - disable while broken in gis unstable repo

 
 # Imagery MapServer + Mapcache Requirements
 
 # Imagery MapServer + Mapcache Requirements

-package "cgi-mapserver"
-package "mapcache-cgi"
-package "mapcache-tools"
+package %w[
+  cgi-mapserver
+  mapcache-cgi
+  mapcache-tools
+]

 
 # Mapserver via Nginx requires as fastcgi spawner
 
 # Mapserver via Nginx requires as fastcgi spawner

-package "spawn-fcgi"
-package "multiwatch"
+package %w[
+  spawn-fcgi
+  multiwatch
+]

 
 # Imagery processing Requirements
 package "imagemagick"
 
 # Imagery misc compression
 
 # Imagery processing Requirements
 package "imagemagick"
 
 # Imagery misc compression

-package "xz-utils"
-package "unzip"
+package %w[
+  xz-utils
+  unzip
+]

 
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"
 
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"

-  mode 0755
+  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 0755
+  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 0755
+  mode "755"

 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
   source "https://www.ordnancesurvey.co.uk/docs/gps/ostn02-ntv2-data.zip"
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
   source "https://www.ordnancesurvey.co.uk/docs/gps/ostn02-ntv2-data.zip"

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

 end
 
 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"
   group "root"

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

 end
 
 nginx_site "default" do
 end
 
 nginx_site "default" do

-  action [:delete]
-  restart_nginx false
+  template "nginx_default.conf.erb"
+  directory "/srv/imagery/default"

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