fix merge

This commit is contained in:
reyesj2 committed 2026-11-16 13:52:05 -06:00
1 parent dea6932342
commit cac027d438
1 file changed
+6 -12
+6 -12
View File
@@ -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 }}