Allow additional docker parameters

salt/idstools/enabled.sls

@@ -26,10 +26,32 @@ so-idstools:
       - http_proxy={{ proxy }}
       - https_proxy={{ proxy }}
       - no_proxy={{ salt['pillar.get']('manager:no_proxy') }}
+      {% if DOCKER.containers['so-elastalert'].extra_env %}
+        {% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %}
+      - {{ XTRAENV }}
+        {% enfor %}
+      {% endif %}
+    {% elif DOCKER.containers['so-elastalert'].extra_env %}
+    - environment:
+      {% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %}
+      - {{ XTRAENV }}
+      {% enfor %}
     {% endif %}
     - binds:
       - /opt/so/conf/idstools/etc:/opt/so/idstools/etc:ro
       - /opt/so/rules/nids:/opt/so/rules/nids:rw
+      - /nsm/rules/suricata:/nsm/rules/suricata:rw
+    {% if DOCKER.containers['so-idstools'].custom_bind_mounts %}
+      {% for BIND in DOCKER.containers['so-idstools'].custom_bind_mounts %}
+      - {{ BIND }}
+      {% endfor %}
+    {% endif %}
+    {% if DOCKER.containers['so-idstools'].extra_hosts %}
+    - extra_hosts:
+      {% for XTRAHOST in DOCKER.containers['so-idstools'].extra_hosts %}
+      - {{ XTRAHOST }}
+      {% endfor %}
+    {% endif %}
     - watch:
       - file: idstoolsetcsync
 

salt/idstools/tools/sbin/so-rule-update

@@ -2,6 +2,10 @@
 
 . /usr/sbin/so-common
 
+# Pull down the latest rules if not airgap
+
+docker exec so-idstools idstools-rulecat -v --suricata-version 6.0 -o /nsm/rules/suricata/ --force
+
 argstr=""
 for arg in "$@"; do
     argstr="${argstr} \"${arg}\""