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

Merge branch 'dev' into feature/nginx-update

Browse Source
This commit is contained in:
William Wernert
2020-07-20 13:13:32 -04:00
parent a5c790c31e 0b0543045b
commit 6f73d62400
151 changed files with 1735 additions and 6655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
salt/nginx/init.sls
View File

@@ -2,6 +2,7 @@
{% set FLEETNODE = salt['pillar.get']('static:fleet_node', False) %}
{% set MANAGER = salt['grains.get']('master') %}
{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.2') %}
{% set IMAGEREPO = salt['pillar.get']('static:imagerepo') %}
# Drop the correct nginx config based on role
nginxconfdir:
@@ -61,7 +62,7 @@ navigatordefaultlayer:
so-nginx:
docker_container.running:
- image: {{ MANAGER }}:5000/soshybridhunter/so-nginx:{{ VERSION }}
- image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-nginx:{{ VERSION }}
- hostname: so-nginx
- binds:
- /opt/so/conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro