Switch minutely replication to use osmdbt

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

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 814c2258242f94b1c5d62f130d4641725764412c..63b33b70fb39c041ef8e3f75ca791dd8416e74b5 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,


@@ -21,10 +21,8 @@ include_recipe "nginx"
 include_recipe "git"
 
 # Imagery gdal Requirements
 include_recipe "git"
 
 # Imagery gdal Requirements

-package %w[
-  gdal-bin
-  python-gdal
-]
+package "gdal-bin"
+# python-gdal - disable while broken in gis unstable repo

 
 # Imagery MapServer + Mapcache Requirements
 package %w[
 
 # Imagery MapServer + Mapcache Requirements
 package %w[


@@ -51,26 +49,26 @@ 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
   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
 
 execute "unzip-ostn02-ntv2-data" do
 end
 
 execute "unzip-ostn02-ntv2-data" do


@@ -78,13 +76,12 @@ execute "unzip-ostn02-ntv2-data" do
   cwd "/srv/imagery/common/ostn02-ntv2-data"
   user "root"
   group "root"
   cwd "/srv/imagery/common/ostn02-ntv2-data"
   user "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
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"
 end
 
 nginx_site "default" do
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"

-  restart_nginx false

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