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

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

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index f8f811988a0f81f8758bcb815469a094ea1c0b2b..7c1a1f88cff78fe9cc71df3ab959a507eb137b79 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
 include_recipe "nginx"
 include_recipe "git"
 
@@ -49,6 +50,13 @@ package %w[
   unzip
 ]
 
+template "/etc/mapserver.conf" do
+  source "mapserver.conf.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"
@@ -63,37 +71,28 @@ directory "/srv/imagery/common" do
   recursive true
 end
 
-directory "/srv/imagery/common/ostn02-ntv2-data" do
+directory "/srv/imagery/sockets" do
   owner "root"
   group "root"
-  mode "755"
+  mode "777"
+  recursive true
 end
 
+# Pre-download uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for EPSG:27700 conversions
 execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do
   command "projsync --file uk_os_OSTN15_NTv2_OSGBtoETRS.tif --system-directory"
   not_if { ::File.exist?("/usr/share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif") }
 end
 
-remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
-  source "https://www.ordnancesurvey.co.uk/documents/resources/ostn02-ntv2-data.zip"
-  not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
-end
-
-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
-
-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"
+# end
 
 systemd_tmpfile "/run/mapserver-fastcgi" do
   type "d"
   owner "imagery"
   group "imagery"
   mode "0755"
+  not_if { kitchen? }
 end