From a1470460a76e724fce901d14d197a98fb133fe6f Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Thu, 2 Oct 2014 16:04:23 -0400
Subject: [PATCH] Move the /static handler into the base and have nginx serve
 the Docker ping endpoint

---
 conf/nginx-nossl.conf |  5 -----
 conf/nginx.conf       |  5 -----
 conf/server-base.conf | 10 ++++++++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/conf/nginx-nossl.conf b/conf/nginx-nossl.conf
index 73a9c7605..fbcce63c0 100644
--- a/conf/nginx-nossl.conf
+++ b/conf/nginx-nossl.conf
@@ -13,10 +13,5 @@ http {
         include server-base.conf;
 
         listen 80 default;
-
-        location /static/ {
-            # checks for static file, if not found proxy to app
-            alias /static/;
-        }
     }
 }
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 43c21b6ca..e208d30e0 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -23,10 +23,5 @@ http {
         ssl_protocols SSLv3 TLSv1;
         ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
         ssl_prefer_server_ciphers on;
-
-        location /static/ {
-            # checks for static file, if not found proxy to app
-            alias /static/;
-        }
     }
 }
diff --git a/conf/server-base.conf b/conf/server-base.conf
index a13cf1424..dc38992bc 100644
--- a/conf/server-base.conf
+++ b/conf/server-base.conf
@@ -24,4 +24,14 @@ location / {
     proxy_pass   http://app_server;
     proxy_read_timeout 2000;
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
+}
+
+location /static/ {
+    # checks for static file, if not found proxy to app
+    alias /static/;
+}
+
+location /v1/_ping {
+    add_header Content-Type text/plain;
+    return 200 'okay';
 }
\ No newline at end of file