From d63358c8f0fccd58522ee22960c8c4192c22008b Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 20 Oct 2020 14:30:06 -0400
Subject: [PATCH] [fix] Correct pillar reference + nginx errors

---
 salt/nginx/etc/nginx.conf | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf
index 84689c8fa..66b3ed3f2 100644
--- a/salt/nginx/etc/nginx.conf
+++ b/salt/nginx/etc/nginx.conf
@@ -1,6 +1,6 @@
 {%- set managerip = salt['pillar.get']('manager:mainip', '') %}
 {%- set role = grains.id.split('_') | last %}
-{%- set url_base = salt['pillar.get']('manager:url_base') %}
+{%- set url_base = salt['pillar.get']('global:url_base') %}
 
 {%- set fleet_manager = salt['pillar.get']('global:fleet_manager') %}
 {%- set fleet_node = salt['pillar.get']('global:fleet_node') %}
@@ -41,13 +41,13 @@ http {
 	server {
 		listen 80 default_server;
 		server_name _;
-		return 301 https://$host$request_uri;
+		return 301 https://{{ url_base }}$request_uri;
 	}
 
 	{%- if airgap is sameas true %}
 	server {
 		listen 7788;
-		server_name _;
+		server_name {{ url_base }};
 		root /opt/socore/html/repo;
 		location /rules/ {
 			allow all;
@@ -87,12 +87,6 @@ http {
 	{%- endif %}
 
 	{%- if role in ['eval', 'managersearch', 'manager', 'standalone'] %}
-	server {
-		listen 80 default_server;
-		server_name _;
-		return 301 https://{{ url_base }}$request_uri;
-	}
-
 	server {
 		listen 443 ssl http2 default_server;
 		server_name _;