From 4436f02f6de3e7cb6f2cfa695a3dcbf3e9289432 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 16 Nov 2020 16:46:22 -0500 Subject: [PATCH] fix nginx for non manaager/fleet nodes --- salt/nginx/etc/nginx.conf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index 1463420b7..e65979f92 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -44,7 +44,9 @@ http { include /etc/nginx/conf.d/*.conf; - {%- if fleet_manager or role == 'fleet' %} + {%- if role in ['eval', 'managersearch', 'manager', 'standalone', 'fleet', 'import'] %} + + {%- if (fleet_manager or role == 'fleet') and role != 'import' %} server { listen 8090 ssl http2 default_server; server_name {{ url_base }}; @@ -69,10 +71,7 @@ http { proxy_buffering off; } } - {%- endif %} - - - {%- if role in ['eval', 'managersearch', 'manager', 'standalone', 'fleet', 'import'] %} + {%- endif %} server { listen 80 default_server;