diff --git a/salt/elasticsearch/enabled.sls b/salt/elasticsearch/enabled.sls index 43fbebb27..932463f2d 100644 --- a/salt/elasticsearch/enabled.sls +++ b/salt/elasticsearch/enabled.sls @@ -40,8 +40,8 @@ so-elasticsearch: - memlock=-1:-1 - nofile=65536:65536 - nproc=4096 - {% if DOCKER.containers['so-elastalert'].extra_env %} - {% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %} + {% if DOCKER.containers['so-elasticsearch'].extra_env %} + {% for XTRAENV in DOCKER.containers['so-elasticsearch'].extra_env %} - {{ XTRAENV }} {% enfor %} {% endif %} diff --git a/salt/idstools/enabled.sls b/salt/idstools/enabled.sls index 558ebff6d..83c54fe5d 100644 --- a/salt/idstools/enabled.sls +++ b/salt/idstools/enabled.sls @@ -31,9 +31,9 @@ so-idstools: - {{ XTRAENV }} {% enfor %} {% endif %} - {% elif DOCKER.containers['so-elastalert'].extra_env %} + {% elif DOCKER.containers['so-idstools'].extra_env %} - environment: - {% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %} + {% for XTRAENV in DOCKER.containers['so-idstools'].extra_env %} - {{ XTRAENV }} {% enfor %} {% endif %} diff --git a/salt/idstools/tools/sbin/so-rule-update b/salt/idstools/tools/sbin/so-rule-update index 5f6895f3b..230d22ab6 100755 --- a/salt/idstools/tools/sbin/so-rule-update +++ b/salt/idstools/tools/sbin/so-rule-update @@ -4,7 +4,7 @@ # Pull down the latest rules if not airgap -docker exec so-idstools idstools-rulecat -v --suricata-version 6.0 -o /nsm/rules/suricata/ --force +#docker exec so-idstools idstools-rulecat -v --suricata-version 6.0 -o /nsm/rules/suricata/ --force argstr="" for arg in "$@"; do diff --git a/salt/playbook/enabled.sls b/salt/playbook/enabled.sls index 9beceee3d..3f796c27f 100644 --- a/salt/playbook/enabled.sls +++ b/salt/playbook/enabled.sls @@ -42,7 +42,7 @@ so-playbook: - extra_hosts: - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} {% if DOCKER.containers['so-playbook'].extra_hosts %} - {% for XTRAHOST in DOCKER.containers['so-kratos'].extra_hosts %} + {% for XTRAHOST in DOCKER.containers['so-playbook'].extra_hosts %} - {{ XTRAHOST }} {% endfor %} {% endif %} @@ -51,8 +51,8 @@ so-playbook: - REDMINE_DB_DATABASE=playbook - REDMINE_DB_USERNAME=playbookdbuser - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }} - {% if DOCKER.containers['so-kratos'].extra_env %} - {% for XTRAENV in DOCKER.containers['so-kratos'].extra_env %} + {% if DOCKER.containers['so-playbook'].extra_env %} + {% for XTRAENV in DOCKER.containers['so-playbook'].extra_env %} - {{ XTRAENV }} {% enfor %} {% endif %} diff --git a/salt/registry/enabled.sls b/salt/registry/enabled.sls index 5d3cbef93..9619fd4b5 100644 --- a/salt/registry/enabled.sls +++ b/salt/registry/enabled.sls @@ -44,8 +44,8 @@ so-dockerregistry: - client_timeout: 180 - environment: - HOME=/root - {% if DOCKER.containers['so-kratos'].extra_env %} - {% for XTRAENV in DOCKER.containers['so-kratos'].extra_env %} + {% if DOCKER.containers['so-dockerregistry'].extra_env %} + {% for XTRAENV in DOCKER.containers['so-dockerregistry'].extra_env %} - {{ XTRAENV }} {% enfor %} {% endif %}