]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/imagery/recipes/default.rb
nftables: allow 169.254.169.0/24 and set log level to notice
[chef.git] / cookbooks / imagery / recipes / default.rb
index ad233f2325f6ab86561d8dc1b851fafbf42125de..3c04dd8a36934b9d70b38b3e91df3bfbe4ede8a0 100644 (file)
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
 include_recipe "nginx"
 include_recipe "git"
 
@@ -63,9 +64,11 @@ 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 "777"
   recursive true
-  action :delete
 end
 
 # Pre-download uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for EPSG:27700 conversions
@@ -74,14 +77,15 @@ execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do
   not_if { ::File.exist?("/usr/share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif") }
 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