diff --git a/salt/nginx/enabled.sls b/salt/nginx/enabled.sls index b25199ed9..8a815ac45 100644 --- a/salt/nginx/enabled.sls +++ b/salt/nginx/enabled.sls @@ -9,6 +9,12 @@ {% from 'ca/trust.map.jinja' import CATRUST %} {% from 'docker/docker.map.jinja' import DOCKERMERGED %} {% from 'nginx/map.jinja' import NGINXMERGED %} +{% if GLOBALS.role != 'so-fleet' %} +{% set container_config = 'so-nginx' %} +{% else %} +{# if this is an so-fleet node then we want to use the port bindings, custom bind mounts defined for fleet #} +{% set container_config = 'so-nginx-fleet-node' %} +{% endif %} include: - ca.trust @@ -16,23 +22,6 @@ include: - nginx.config - nginx.sostatus -{% if GLOBALS.role != 'so-fleet' %} -{% set container_config = 'so-nginx' %} -make-rule-dir-nginx: - file.directory: - - name: /nsm/rules - - user: socore - - group: socore - - recurse: - - user - - group - - show_changes: False - -{% else %} -{# if this is an so-fleet node then we want to use the port bindings, custom bind mounts defined for fleet #} -{% set container_config = 'so-nginx-fleet-node' %} -{% endif %} - so-nginx: docker_container.running: - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-nginx:{{ GLOBALS.so_version }} diff --git a/salt/soc/config.sls b/salt/soc/config.sls index be2887897..53ee7f40a 100644 --- a/salt/soc/config.sls +++ b/salt/soc/config.sls @@ -251,6 +251,16 @@ socsensoronirepos: - mode: 775 - makedirs: True +nsm_rules_dir: + file.directory: + - name: /nsm/rules + - user: socore + - group: socore + - recurse: + - user + - group + - show_changes: False + create_custom_local_yara_repo_template: git.present: - name: /nsm/rules/custom-local-repos/local-yara