mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-11-18 18:16:02 +01:00
fix merge
This commit is contained in:
1 file changed
+6
-12
+6
-12
@@ -10,18 +10,6 @@
|
||||
{% from 'docker/docker.map.jinja' import DOCKERMERGED %}
|
||||
{% from 'nginx/map.jinja' import NGINXMERGED %}
|
||||
|
||||
include:
|
||||
- ca.trust
|
||||
- nginx.ssl
|
||||
- nginx.config
|
||||
- nginx.sostatus
|
||||
|
||||
fleet_beats_dir_nginx:
|
||||
file.directory:
|
||||
- name: /nsm/elastic-fleet/artifacts/beats
|
||||
- makedirs: True
|
||||
- show_changes: False
|
||||
|
||||
{% if GLOBALS.role != 'so-fleet' %}
|
||||
{% set container_config = 'so-nginx' %}
|
||||
{% else %}
|
||||
@@ -35,6 +23,12 @@ include:
|
||||
- nginx.config
|
||||
- nginx.sostatus
|
||||
|
||||
fleet_beats_dir_nginx:
|
||||
file.directory:
|
||||
- name: /nsm/elastic-fleet/artifacts/beats
|
||||
- makedirs: True
|
||||
- show_changes: False
|
||||
|
||||
so-nginx:
|
||||
docker_container.running:
|
||||
- image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-nginx:{{ GLOBALS.so_version }}
|
||||
|
||||
Reference in new issue
Block a user