From 5315c51197d4dd0ca96c724af1ae578daa2e39d9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 18 May 2023 16:52:38 -0400 Subject: [PATCH] Allow additional docker parameters --- salt/elastalert/enabled.sls | 2 +- salt/elastic-fleet-package-registry/enabled.sls | 2 +- salt/elasticfleet/enabled.sls | 2 +- salt/elasticsearch/enabled.sls | 2 +- salt/idh/enabled.sls | 2 +- salt/idstools/enabled.sls | 4 ++-- salt/influxdb/enabled.sls | 2 +- salt/kibana/enabled.sls | 2 +- salt/kratos/enabled.sls | 2 +- salt/logstash/enabled.sls | 2 +- salt/nginx/enabled.sls | 2 +- salt/pcap/enabled.sls | 2 +- salt/playbook/enabled.sls | 2 +- salt/redis/enabled.sls | 2 +- salt/registry/enabled.sls | 2 +- salt/sensoroni/enabled.sls | 2 +- salt/soc/enabled.sls | 2 +- salt/soctopus/enabled.sls | 2 +- salt/strelka/backend/enabled.sls | 2 +- salt/strelka/coordinator/enabled.sls | 2 +- salt/strelka/filestream/enabled.sls | 4 ++-- salt/strelka/frontend/enabled.sls | 2 +- salt/strelka/gatekeeper/enabled.sls | 2 +- salt/strelka/manager/enabled.sls | 2 +- salt/telegraf/enabled.sls | 2 +- salt/zeek/enabled.sls | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/salt/elastalert/enabled.sls b/salt/elastalert/enabled.sls index 24b73c375..e4b3642db 100644 --- a/salt/elastalert/enabled.sls +++ b/salt/elastalert/enabled.sls @@ -47,7 +47,7 @@ so-elastalert: - environment: {% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - require: - cmd: wait_for_elasticsearch diff --git a/salt/elastic-fleet-package-registry/enabled.sls b/salt/elastic-fleet-package-registry/enabled.sls index 5c5ece964..3cd90ba87 100644 --- a/salt/elastic-fleet-package-registry/enabled.sls +++ b/salt/elastic-fleet-package-registry/enabled.sls @@ -43,7 +43,7 @@ so-elastic-fleet-package-registry: - environment: {% for XTRAENV in DOCKER.containers['so-elastic-fleet-package-registry'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} delete_so-elastic-fleet-package-registry_so-status.disabled: file.uncomment: diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls index bdcc027d8..e93ebd4db 100644 --- a/salt/elasticfleet/enabled.sls +++ b/salt/elasticfleet/enabled.sls @@ -58,7 +58,7 @@ so-elastic-fleet: {% if DOCKER.containers['so-elastic-fleet'].extra_env %} {% for XTRAENV in DOCKER.containers['so-elastic-fleet'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} {% endif %} diff --git a/salt/elasticsearch/enabled.sls b/salt/elasticsearch/enabled.sls index 932463f2d..4777e3bce 100644 --- a/salt/elasticsearch/enabled.sls +++ b/salt/elasticsearch/enabled.sls @@ -43,7 +43,7 @@ so-elasticsearch: {% if DOCKER.containers['so-elasticsearch'].extra_env %} {% for XTRAENV in DOCKER.containers['so-elasticsearch'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - port_bindings: {% for BINDING in DOCKER.containers['so-elasticsearch'].port_bindings %} diff --git a/salt/idh/enabled.sls b/salt/idh/enabled.sls index b93898063..480e7eedc 100644 --- a/salt/idh/enabled.sls +++ b/salt/idh/enabled.sls @@ -35,7 +35,7 @@ so-idh: - environment: {% for XTRAENV in DOCKER.containers['so-idh'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - watch: - file: opencanary_config diff --git a/salt/idstools/enabled.sls b/salt/idstools/enabled.sls index 83c54fe5d..70e52453c 100644 --- a/salt/idstools/enabled.sls +++ b/salt/idstools/enabled.sls @@ -29,13 +29,13 @@ so-idstools: {% if DOCKER.containers['so-elastalert'].extra_env %} {% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} {% elif DOCKER.containers['so-idstools'].extra_env %} - environment: {% for XTRAENV in DOCKER.containers['so-idstools'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - binds: - /opt/so/conf/idstools/etc:/opt/so/idstools/etc:ro diff --git a/salt/influxdb/enabled.sls b/salt/influxdb/enabled.sls index 1f2cc86aa..70f4c404f 100644 --- a/salt/influxdb/enabled.sls +++ b/salt/influxdb/enabled.sls @@ -33,7 +33,7 @@ so-influxdb: {% if DOCKER.containers['so-influxdb'].extra_env %} {% for XTRAENV in DOCKER.containers['so-influxdb'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - binds: - /opt/so/log/influxdb/:/log:rw diff --git a/salt/kibana/enabled.sls b/salt/kibana/enabled.sls index 343b9b510..56aac26cc 100644 --- a/salt/kibana/enabled.sls +++ b/salt/kibana/enabled.sls @@ -28,7 +28,7 @@ so-kibana: {% if DOCKER.containers['so-kibana'].extra_env %} {% for XTRAENV in DOCKER.containers['so-kibana'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - extra_hosts: - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} diff --git a/salt/kratos/enabled.sls b/salt/kratos/enabled.sls index 823fd6672..52d53a4db 100644 --- a/salt/kratos/enabled.sls +++ b/salt/kratos/enabled.sls @@ -44,7 +44,7 @@ so-kratos: - environment: {% for XTRAENV in DOCKER.containers['so-kratos'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - restart_policy: unless-stopped - watch: diff --git a/salt/logstash/enabled.sls b/salt/logstash/enabled.sls index 97e0e7e2d..c0129c6e1 100644 --- a/salt/logstash/enabled.sls +++ b/salt/logstash/enabled.sls @@ -36,7 +36,7 @@ so-logstash: {% if DOCKER.containers['so-logstash'].extra_env %} {% for XTRAENV in DOCKER.containers['so-logstash'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - port_bindings: {% for BINDING in DOCKER.containers['so-logstash'].port_bindings %} diff --git a/salt/nginx/enabled.sls b/salt/nginx/enabled.sls index d85c58726..602c7d33d 100644 --- a/salt/nginx/enabled.sls +++ b/salt/nginx/enabled.sls @@ -52,7 +52,7 @@ so-nginx: - environment: {% for XTRAENV in DOCKER.containers['so-nginx'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - cap_add: NET_BIND_SERVICE - port_bindings: diff --git a/salt/pcap/enabled.sls b/salt/pcap/enabled.sls index 12dc28c6d..ea86e8192 100644 --- a/salt/pcap/enabled.sls +++ b/salt/pcap/enabled.sls @@ -39,7 +39,7 @@ so-steno: - environment: {% for XTRAENV in DOCKER.containers['so-steno'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - watch: - file: stenoconf diff --git a/salt/playbook/enabled.sls b/salt/playbook/enabled.sls index 3f796c27f..434cb18e4 100644 --- a/salt/playbook/enabled.sls +++ b/salt/playbook/enabled.sls @@ -54,7 +54,7 @@ so-playbook: {% if DOCKER.containers['so-playbook'].extra_env %} {% for XTRAENV in DOCKER.containers['so-playbook'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - port_bindings: {% for BINDING in DOCKER.containers['so-playbook'].port_bindings %} diff --git a/salt/redis/enabled.sls b/salt/redis/enabled.sls index fa69cdf05..c9ba37094 100644 --- a/salt/redis/enabled.sls +++ b/salt/redis/enabled.sls @@ -50,7 +50,7 @@ so-redis: - environment: {% for XTRAENV in DOCKER.containers['so-redis'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - entrypoint: "redis-server /usr/local/etc/redis/redis.conf" - watch: diff --git a/salt/registry/enabled.sls b/salt/registry/enabled.sls index 9619fd4b5..4d9867676 100644 --- a/salt/registry/enabled.sls +++ b/salt/registry/enabled.sls @@ -47,7 +47,7 @@ so-dockerregistry: {% if DOCKER.containers['so-dockerregistry'].extra_env %} {% for XTRAENV in DOCKER.containers['so-dockerregistry'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - retry: attempts: 5 diff --git a/salt/sensoroni/enabled.sls b/salt/sensoroni/enabled.sls index 9078d2867..72ab7e6e6 100644 --- a/salt/sensoroni/enabled.sls +++ b/salt/sensoroni/enabled.sls @@ -36,7 +36,7 @@ so-sensoroni: - environment: {% for XTRAENV in DOCKER.containers['so-sensoroni'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - watch: - file: /opt/so/conf/sensoroni/sensoroni.json diff --git a/salt/soc/enabled.sls b/salt/soc/enabled.sls index 55b65e335..bc55f2d94 100644 --- a/salt/soc/enabled.sls +++ b/salt/soc/enabled.sls @@ -51,7 +51,7 @@ so-soc: - environment: {% for XTRAENV in DOCKER.containers['so-soc'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - watch: - file: /opt/so/conf/soc/* diff --git a/salt/soctopus/enabled.sls b/salt/soctopus/enabled.sls index 9007360f9..2184de581 100644 --- a/salt/soctopus/enabled.sls +++ b/salt/soctopus/enabled.sls @@ -50,7 +50,7 @@ so-soctopus: - environment: {% for XTRAENV in DOCKER.containers['so-soctopus'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - require: - file: soctopusconf diff --git a/salt/strelka/backend/enabled.sls b/salt/strelka/backend/enabled.sls index 81b516e86..c2272cb84 100644 --- a/salt/strelka/backend/enabled.sls +++ b/salt/strelka/backend/enabled.sls @@ -39,7 +39,7 @@ strelka_backend: - environment: {% for XTRAENV in DOCKER.containers['so-strelka-backend'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - restart_policy: on-failure diff --git a/salt/strelka/coordinator/enabled.sls b/salt/strelka/coordinator/enabled.sls index 1fb03b949..7a156bc9a 100644 --- a/salt/strelka/coordinator/enabled.sls +++ b/salt/strelka/coordinator/enabled.sls @@ -35,7 +35,7 @@ strelka_coordinator: - environment: {% for XTRAENV in DOCKER.containers['so-strelka-coordinator'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} {% if DOCKER.containers['so-strelka-coordinator'].custom_bind_mounts %} - binds: diff --git a/salt/strelka/filestream/enabled.sls b/salt/strelka/filestream/enabled.sls index 1d821c5fa..f04631eca 100644 --- a/salt/strelka/filestream/enabled.sls +++ b/salt/strelka/filestream/enabled.sls @@ -39,9 +39,9 @@ strelka_filestream: - environment: {% for XTRAENV in DOCKER.containers['so-strelka-filestream'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - + delete_so-strelka-filestream_so-status.disabled: file.uncomment: - name: /opt/so/conf/so-status/so-status.conf diff --git a/salt/strelka/frontend/enabled.sls b/salt/strelka/frontend/enabled.sls index 27e0121db..e4ecc7ca5 100644 --- a/salt/strelka/frontend/enabled.sls +++ b/salt/strelka/frontend/enabled.sls @@ -44,7 +44,7 @@ strelka_frontend: - environment: {% for XTRAENV in DOCKER.containers['so-strelka-frontend'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} delete_so-strelka-frontend_so-status.disabled: diff --git a/salt/strelka/gatekeeper/enabled.sls b/salt/strelka/gatekeeper/enabled.sls index b37080b75..b309403f4 100644 --- a/salt/strelka/gatekeeper/enabled.sls +++ b/salt/strelka/gatekeeper/enabled.sls @@ -41,7 +41,7 @@ strelka_gatekeeper: - environment: {% for XTRAENV in DOCKER.containers['so-strelka-gatekeeper'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} delete_so-strelka-gatekeeper_so-status.disabled: diff --git a/salt/strelka/manager/enabled.sls b/salt/strelka/manager/enabled.sls index ccb3f8237..aec44b4b0 100644 --- a/salt/strelka/manager/enabled.sls +++ b/salt/strelka/manager/enabled.sls @@ -38,7 +38,7 @@ strelka_manager: - environment: {% for XTRAENV in DOCKER.containers['so-strelka-manager'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} delete_so-strelka-manager_so-status.disabled: diff --git a/salt/telegraf/enabled.sls b/salt/telegraf/enabled.sls index 9a5ba527e..9d8834112 100644 --- a/salt/telegraf/enabled.sls +++ b/salt/telegraf/enabled.sls @@ -25,7 +25,7 @@ so-telegraf: {% if DOCKER.containers['so-telegraf'].extra_env %} {% for XTRAENV in DOCKER.containers['so-telegraf'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - network_mode: host - init: True diff --git a/salt/zeek/enabled.sls b/salt/zeek/enabled.sls index b701dfd19..7f8c23655 100644 --- a/salt/zeek/enabled.sls +++ b/salt/zeek/enabled.sls @@ -48,7 +48,7 @@ so-zeek: - environment: {% for XTRAENV in DOCKER.containers['so-zeek'].extra_env %} - {{ XTRAENV }} - {% enfor %} + {% endfor %} {% endif %} - watch: - file: /opt/so/conf/zeek/local.zeek