Merge branch 'topic/health_check' into develop

Conflicts:
	project.clj

Author: cgaustin

default.conf

@@ -50,6 +50,27 @@ server {
        proxy_pass http://127.0.0.1:9876/status;
     }
 
+    location /healthy {
+       if ($request_method = 'OPTIONS') {
+          add_header 'Access-Control-Allow-Origin' '*';
+          add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+          add_header 'Access-Control-Max-Age' 1728000;
+          add_header 'Content-Type' 'text/plain; charset=utf-8';
+          add_header 'Content-Length' 0;
+          return 204;
+       }   
+       if ($request_method = 'GET') {
+          add_header 'Access-Control-Allow-Origin' '*';
+          add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+          add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+          add_header 'Access-Control-Expose-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+       }
+       proxy_connect_timeout 600s;
+       proxy_send_timeout 600s;
+       proxy_read_timeout 600s;
+       proxy_pass http://127.0.0.1:9876/healthy;
+    }
+
     location /bulk-ingest {
        if ($request_method = 'OPTIONS') {
           add_header 'Access-Control-Allow-Origin' '*';

project.clj

@@ -1,4 +1,4 @@
-(defproject lcmap-mastodon "3.2.3"
+(defproject lcmap-mastodon "3.2.4"
   :description "Functions for LCMAP data curation"
   :url "https://eros.usgs.gov"
   :license {:name "Unlicense"

resources/docker-compose.yml

@@ -37,7 +37,7 @@ services:
     volumes:
       - "/home/caustin/workspace/data:/data"
     environment:
-      - SERVER_TYPE=ard
+      - DATA_TYPE=ard
       - ARD_PATH=/data/ard/{tm,etm,oli_tirs}/ARD_Tile/*/CU/
       - ARD_HOST=http://127.0.0.1
       - CHIPMUNK_HOST=http://127.0.0.1:5656