imagery: fixes for host and https

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 6b4cbe9db3e07460f991fa1a30e2cf6d98b6a6c2..a473b445299d764a80fe35e5184702e7bd9c97ed 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -70,10 +70,10 @@ execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do
   not_if { ::File.exist?("/usr/share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif") }
 end
 
   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"
 
 systemd_tmpfile "/run/mapserver-fastcgi" do
   type "d"

diff --git a/cookbooks/imagery/templates/default/nginx_titiler.conf.erb b/cookbooks/imagery/templates/default/nginx_titiler.conf.erb
index 2ce67a36b0582e227751231f4979675db482975a..85961b8cf252cb1c6c1638fff857c22ec82dbb36 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_titiler.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_titiler.conf.erb
@@ -33,12 +33,12 @@ server {
     gzip_comp_level 9;
     gzip_vary on;
 
     gzip_comp_level 9;
     gzip_vary on;
 

-    location /api/v1/titiler {
+    location / {

       rewrite ^/api/v1/titiler(.*)$ $1 break;
       proxy_pass http://localhost:8080;
       proxy_set_header HOST $host;
       proxy_set_header Referer $http_referer;
       proxy_set_header X-Forwarded-For $remote_addr;
       rewrite ^/api/v1/titiler(.*)$ $1 break;
       proxy_pass http://localhost:8080;
       proxy_set_header HOST $host;
       proxy_set_header Referer $http_referer;
       proxy_set_header X-Forwarded-For $remote_addr;

-      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Forwarded-Proto https;

     }
 }
     }
 }