From 10a61d05a11974625762cdf7a7d5b254676b0b50 Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Mon, 28 Jul 2014 12:21:06 -0700 Subject: [PATCH] Stopy proxying etcd (localhost:4001) on https:/$MASTER_IP/etcd. --- cluster/saltbase/salt/nginx/kubernetes-site | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cluster/saltbase/salt/nginx/kubernetes-site b/cluster/saltbase/salt/nginx/kubernetes-site index c5113c3489a..4811db8429b 100644 --- a/cluster/saltbase/salt/nginx/kubernetes-site +++ b/cluster/saltbase/salt/nginx/kubernetes-site @@ -58,18 +58,4 @@ server { # Disable retry proxy_next_upstream off; } - location /etcd/ { - auth_basic "Restricted"; - auth_basic_user_file /usr/share/nginx/htpasswd; - - # Proxy settings - proxy_pass http://localhost:4001/; - proxy_connect_timeout 159s; - proxy_send_timeout 600s; - proxy_read_timeout 600s; - proxy_buffer_size 64k; - proxy_buffers 16 32k; - proxy_busy_buffers_size 64k; - proxy_temp_file_write_size 64k; - } }