diff --git a/config/nomad/nginx.nmd.in b/config/nomad/nginx.nmd.in index 6399b0ca2d60d96e4e9ff625dbb46af61d1da6d6..62f2ea6281e8b142cf3d13a0746ba5337e87e6c1 100644 --- a/config/nomad/nginx.nmd.in +++ b/config/nomad/nginx.nmd.in @@ -42,11 +42,13 @@ job "nginx" { service { port = "nginx" name = "nginx" + } check { name = "alive" - type = "tcp" - interval = "10s" + type = "http" + path = "/nginx_health" timeout = "2s" + interval = "10s" } } @@ -59,4 +61,4 @@ job "nginx" { } } -} \ No newline at end of file +} diff --git a/tests/automatic/settings/nginx.conf.tpl b/tests/automatic/settings/nginx.conf.tpl index e688e587b4bba79b28d1de7a1bee87fa2e957bb7..d97db54839f625463a49639728054f647f247690 100644 --- a/tests/automatic/settings/nginx.conf.tpl +++ b/tests/automatic/settings/nginx.conf.tpl @@ -23,5 +23,8 @@ http { rewrite ^/discovery(/.*) $1 break; proxy_pass http://$discovery_endpoint:5006$uri; } + location /nginx-health { + return 200 "healthy\n"; + } } }