From f5d16181d4bc5c6262c1cf92482ac37adb21ab05 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 6 Dec 2018 14:40:44 -0500 Subject: [PATCH] Common Module - Add Fleet to nginx --- salt/common/nginx/nginx.conf.so-eval | 11 +++++++++++ salt/common/nginx/nginx.conf.so-master | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval index 07813d1a1..4ffb2835f 100644 --- a/salt/common/nginx/nginx.conf.so-eval +++ b/salt/common/nginx/nginx.conf.so-eval @@ -109,6 +109,17 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Proxy ""; + } + location /fleet/ { + rewrite /fleet/(.*) /$1 break; + proxy_pass https://{{ masterip }}:8080/; + proxy_read_timeout 90; + proxy_connect_timeout 90; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Proxy ""; + } error_page 404 /404.html; diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master index 07813d1a1..535009c71 100644 --- a/salt/common/nginx/nginx.conf.so-master +++ b/salt/common/nginx/nginx.conf.so-master @@ -111,6 +111,19 @@ http { } + + location /fleet/ { + rewrite /fleet/(.*) /$1 break; + proxy_pass https://{{ masterip }}:8080/; + proxy_read_timeout 90; + proxy_connect_timeout 90; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Proxy ""; + + } + error_page 404 /404.html; location = /40x.html { }