CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Correct pillar reference + nginx errors

Browse Source
This commit is contained in:
William Wernert
2020-10-20 14:30:06 -04:00
parent 42e285cfbe
commit d63358c8f0
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
salt/nginx/etc/nginx.conf
View File

@@ -1,6 +1,6 @@
{%- set managerip = salt['pillar.get']('manager:mainip', '') %} {%- set managerip = salt['pillar.get']('manager:mainip', '') %}
{%- set role = grains.id.split('_') | last %} {%- 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_manager = salt['pillar.get']('global:fleet_manager') %}
{%- set fleet_node = salt['pillar.get']('global:fleet_node') %} {%- set fleet_node = salt['pillar.get']('global:fleet_node') %}
@@ -41,13 +41,13 @@ http {
server { server {
listen 80 default_server; listen 80 default_server;
server_name _; server_name _;
return 301 https://$host$request_uri; return 301 https://{{ url_base }}$request_uri;
} }
{%- if airgap is sameas true %} {%- if airgap is sameas true %}
server { server {
listen 7788; listen 7788;
server_name _; server_name {{ url_base }};
root /opt/socore/html/repo; root /opt/socore/html/repo;
location /rules/ { location /rules/ {
allow all; allow all;
@@ -87,12 +87,6 @@ http {
{%- endif %} {%- endif %}
{%- if role in ['eval', 'managersearch', 'manager', 'standalone'] %} {%- if role in ['eval', 'managersearch', 'manager', 'standalone'] %}
server {
listen 80 default_server;
server_name _;
return 301 https://{{ url_base }}$request_uri;
}
server { server {
listen 443 ssl http2 default_server; listen 443 ssl http2 default_server;
server_name _; server_name _;