diff --git a/salt/bro/init.sls b/salt/bro/init.sls index f406558be..2e6f10f3c 100644 --- a/salt/bro/init.sls +++ b/salt/bro/init.sls @@ -92,13 +92,13 @@ localbrosync: so-communitybroimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-communitybro:HH1.0.3 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-communitybro:HH1.0.3 so-bro: docker_container.running: - require: - so-communitybroimage - - image: soshybridhunter/so-communitybro:HH1.0.3 + - image: docker.io/soshybridhunter/so-communitybro:HH1.0.3 - privileged: True - binds: - /nsm/bro/logs:/nsm/bro/logs:rw @@ -125,13 +125,13 @@ localbrosync: so-broimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-bro:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-bro:HH1.1.1 so-bro: docker_container.running: - require: - so-broimage - - image: soshybridhunter/so-bro:HH1.1.1 + - image: docker.io/soshybridhunter/so-bro:HH1.1.1 - privileged: True - binds: - /nsm/bro/logs:/nsm/bro/logs:rw diff --git a/salt/common/init.sls b/salt/common/init.sls index 9d34c4a20..1bba4c871 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -116,13 +116,13 @@ nginxtmp: # Start the core docker so-coreimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-core:HH1.1.2 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-core:HH1.1.2 so-core: docker_container.running: - require: - so-coreimage - - image: soshybridhunter/so-core:HH1.1.2 + - image: docker.io/soshybridhunter/so-core:HH1.1.2 - hostname: so-core - user: socore - binds: @@ -176,13 +176,13 @@ tgrafconf: so-telegrafimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-telegraf:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-telegraf:HH1.1.0 so-telegraf: docker_container.running: - require: - so-telegrafimage - - image: soshybridhunter/so-telegraf:HH1.1.0 + - image: docker.io/soshybridhunter/so-telegraf:HH1.1.0 - environment: - HOST_PROC=/host/proc - HOST_ETC=/host/etc @@ -237,13 +237,13 @@ influxdbconf: so-influximage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-influxdb:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-influxdb:HH1.1.0 so-influxdb: docker_container.running: - require: - so-influximage - - image: soshybridhunter/so-influxdb:HH1.1.0 + - image: docker.io/soshybridhunter/so-influxdb:HH1.1.0 - hostname: influxdb - environment: - INFLUXDB_HTTP_LOG_ENABLED=false @@ -402,11 +402,11 @@ dashboard-{{ SN }}: # Install the docker. This needs to be behind nginx at some point so-grafanaimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-grafana:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-grafana:HH1.1.0 so-grafana: docker_container.running: - - image: soshybridhunter/so-grafana:HH1.1.0 + - image: docker.io/soshybridhunter/so-grafana:HH1.1.0 - hostname: grafana - user: socore - binds: diff --git a/salt/curator/init.sls b/salt/curator/init.sls index 5c788b891..74dd47a99 100644 --- a/salt/curator/init.sls +++ b/salt/curator/init.sls @@ -114,13 +114,13 @@ curdel: so-curatorimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-curator:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-curator:HH1.1.0 so-curator: docker_container.running: - require: - so-curatorimage - - image: soshybridhunter/so-curator:HH1.1.0 + - image: docker.io/soshybridhunter/so-curator:HH1.1.0 - hostname: curator - name: so-curator - user: curator diff --git a/salt/elastalert/init.sls b/salt/elastalert/init.sls index 8e8b32ae6..999bbbd91 100644 --- a/salt/elastalert/init.sls +++ b/salt/elastalert/init.sls @@ -111,13 +111,13 @@ elastaconf: so-elastalertimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-elastalert:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-elastalert:HH1.1.1 so-elastalert: docker_container.running: - require: - so-elastalertimage - - image: soshybridhunter/so-elastalert:HH1.1.1 + - image: docker.io/soshybridhunter/so-elastalert:HH1.1.1 - hostname: elastalert - name: so-elastalert - user: elastalert diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index 1eb3a19e4..8ff9606bc 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -92,13 +92,13 @@ eslogdir: so-elasticsearchimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-elasticsearch:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-elasticsearch:HH1.1.0 so-elasticsearch: docker_container.running: - require: - so-elasticsearchimage - - image: soshybridhunter/so-elasticsearch:HH1.1.0 + - image: docker.io/soshybridhunter/so-elasticsearch:HH1.1.0 - hostname: elasticsearch - name: so-elasticsearch - user: elasticsearch @@ -155,13 +155,13 @@ freqlogdir: so-freqimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-freqserver:HH1.0.3 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-freqserver:HH1.0.3 so-freq: docker_container.running: - require: - so-freqimage - - image: soshybridhunter/so-freqserver:HH1.0.3 + - image: docker.io/soshybridhunter/so-freqserver:HH1.0.3 - hostname: freqserver - name: so-freqserver - user: freqserver @@ -197,13 +197,13 @@ dstatslogdir: so-domainstatsimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-domainstats:HH1.0.3 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-domainstats:HH1.0.3 so-domainstats: docker_container.running: - require: - so-domainstatsimage - - image: soshybridhunter/so-domainstats:HH1.0.3 + - image: docker.io/soshybridhunter/so-domainstats:HH1.0.3 - hostname: domainstats - name: so-domainstats - user: domainstats diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls index b92899ef0..b1acae649 100644 --- a/salt/filebeat/init.sls +++ b/salt/filebeat/init.sls @@ -58,13 +58,13 @@ filebeatconfsync: so-filebeatimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-filebeat:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-filebeat:HH1.1.1 so-filebeat: docker_container.running: - require: - so-filebeatimage - - image: soshybridhunter/so-filebeat:HH1.1.1 + - image: docker.io/soshybridhunter/so-filebeat:HH1.1.1 - hostname: so-filebeat - user: root - extra_hosts: {{ MASTER }}:{{ MASTERIP }} diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls index 83c019880..e633bef7f 100644 --- a/salt/fleet/init.sls +++ b/salt/fleet/init.sls @@ -61,13 +61,13 @@ fleetdbpriv: so-fleetimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-fleet:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-fleet:HH1.1.0 so-fleet: docker_container.running: - require: - so-fleetimage - - image: soshybridhunter/so-fleet:HH1.1.0 + - image: docker.io/soshybridhunter/so-fleet:HH1.1.0 - hostname: so-fleet - port_bindings: - 0.0.0.0:8080:8080 diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh index 7691b1eb2..5f6dcb949 100644 --- a/salt/fleet/so-fleet-setup.sh +++ b/salt/fleet/so-fleet-setup.sh @@ -29,7 +29,7 @@ docker run \ --rm \ --mount type=bind,source=/opt/so/conf/fleet/packages,target=/output \ --mount type=bind,source=/etc/pki/launcher.crt,target=/var/launcher/launcher.crt \ - soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080 + docker.io/soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080 cp /opt/so/conf/fleet/packages/launcher.* /opt/so/saltstack/salt/launcher/packages/ #Update timestamp on packages webpage diff --git a/salt/hive/init.sls b/salt/hive/init.sls index 5897f6a93..ced11c6ff 100644 --- a/salt/hive/init.sls +++ b/salt/hive/init.sls @@ -33,13 +33,13 @@ hiveesdata: so-thehive-esimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive-es:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-thehive-es:HH1.1.1 so-thehive-es: docker_container.running: - require: - so-thehive-esimage - - image: soshybridhunter/so-thehive-es:HH1.1.1 + - image: docker.io/soshybridhunter/so-thehive-es:HH1.1.1 - hostname: so-thehive-es - name: so-thehive-es - user: 939 @@ -68,7 +68,7 @@ so-thehive-es: #so-corteximage: # cmd.run: -# - name: docker pull --disable-content-trust=false soshybridhunter/so-cortex:HH1.0.3 +# - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-cortex:HH1.0.3 #so-cortex: # docker_container.running: @@ -80,13 +80,13 @@ so-thehive-es: so-thehiveimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-thehive:HH1.1.1 so-thehive: docker_container.running: - require: - so-thehiveimage - - image: soshybridhunter/so-thehive:HH1.1.1 + - image: docker.io/soshybridhunter/so-thehive:HH1.1.1 - environment: - ELASTICSEARCH_HOST={{ MASTERIP }} - hostname: so-thehive diff --git a/salt/idstools/init.sls b/salt/idstools/init.sls index cabd0ee73..9ec6f53f7 100644 --- a/salt/idstools/init.sls +++ b/salt/idstools/init.sls @@ -63,13 +63,13 @@ ruleslink: so-idstoolsimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-idstools:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-idstools:HH1.1.0 so-idstools: docker_container.running: - require: - so-idstoolsimage - - image: soshybridhunter/so-idstools:HH1.1.0 + - image: docker.io/soshybridhunter/so-idstools:HH1.1.0 - hostname: so-idstools - user: socore - binds: diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls index 26910b5b0..0d6262600 100644 --- a/salt/kibana/init.sls +++ b/salt/kibana/init.sls @@ -56,14 +56,14 @@ synckibanacustom: so-kibanaimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-kibana:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-kibana:HH1.1.1 # Start the kibana docker so-kibana: docker_container.running: - require: - so-kibanaimage - - image: soshybridhunter/so-kibana:HH1.1.1 + - image: docker.io/soshybridhunter/so-kibana:HH1.1.1 - hostname: kibana - user: kibana - environment: diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls index 589d22d1c..ee13db281 100644 --- a/salt/logstash/init.sls +++ b/salt/logstash/init.sls @@ -148,13 +148,13 @@ lslogdir: # Add the container so-logstashimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-logstash:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-logstash:HH1.1.1 so-logstash: docker_container.running: - require: - so-logstashimage - - image: soshybridhunter/so-logstash:HH1.1.1 + - image: docker.io/soshybridhunter/so-logstash:HH1.1.1 - hostname: so-logstash - name: so-logstash - user: logstash diff --git a/salt/master/init.sls b/salt/master/init.sls index 8b68a3cf1..1a7efe744 100644 --- a/salt/master/init.sls +++ b/salt/master/init.sls @@ -48,14 +48,14 @@ acngcopyconf: so-acngimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-acng:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-acng:HH1.1.0 # Install the apt-cacher-ng container so-aptcacherng: docker_container.running: - require: - so-acngimage - - image: soshybridhunter/so-acng:HH1.1.0 + - image: docker.io/soshybridhunter/so-acng:HH1.1.0 - hostname: so-acng - port_bindings: - 0.0.0.0:3142:3142 diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 4ade15f33..a0136ae9b 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -50,13 +50,13 @@ mysqldatadir: so-mysqlimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-mysql:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-mysql:HH1.1.0 so-mysql: docker_container.running: - require: - so-mysqlimage - - image: soshybridhunter/so-mysql:HH1.1.0 + - image: docker.io/soshybridhunter/so-mysql:HH1.1.0 - hostname: so-mysql - user: socore - port_bindings: diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls index 86408c0e3..ed23cf308 100644 --- a/salt/pcap/init.sls +++ b/salt/pcap/init.sls @@ -96,13 +96,13 @@ stenolog: so-stenoimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-steno:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-steno:HH1.1.1 so-steno: docker_container.running: - require: - so-stenoimage - - image: soshybridhunter/so-steno:HH1.1.1 + - image: docker.io/soshybridhunter/so-steno:HH1.1.1 - network_mode: host - privileged: True - port_bindings: diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index a72514fe9..ef66966f3 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -26,13 +26,13 @@ navigatorconfig: so-playbookimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-playbook:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-playbook:HH1.1.1 so-playbook: docker_container.running: - require: - so-playbookimage - - image: soshybridhunter/so-playbook:HH1.1.1 + - image: docker.io/soshybridhunter/so-playbook:HH1.1.1 - hostname: playbook - name: so-playbook - binds: @@ -42,13 +42,13 @@ so-playbook: so-navigatorimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-navigator:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-navigator:HH1.1.1 so-navigator: docker_container.running: - require: - so-navigatorimage - - image: soshybridhunter/so-navigator:HH1.1.1 + - image: docker.io/soshybridhunter/so-navigator:HH1.1.1 - hostname: navigator - name: so-navigator - binds: diff --git a/salt/redis/init.sls b/salt/redis/init.sls index 174c1725b..18178ce3b 100644 --- a/salt/redis/init.sls +++ b/salt/redis/init.sls @@ -46,13 +46,13 @@ redisconfsync: so-redisimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-redis:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-redis:HH1.1.0 so-redis: docker_container.running: - require: - so-redisimage - - image: soshybridhunter/so-redis:HH1.1.0 + - image: docker.io/soshybridhunter/so-redis:HH1.1.0 - hostname: so-redis - user: socore - port_bindings: diff --git a/salt/sensoroni/init.sls b/salt/sensoroni/init.sls index 2c06ba7a8..245c34344 100644 --- a/salt/sensoroni/init.sls +++ b/salt/sensoroni/init.sls @@ -29,13 +29,13 @@ sensoronisync: so-sensoroniimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-sensoroni:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-sensoroni:HH1.1.1 so-sensoroni: docker_container.running: - require: - so-sensoroniimage - - image: soshybridhunter/so-sensoroni:HH1.1.1 + - image: docker.io/soshybridhunter/so-sensoroni:HH1.1.1 - hostname: sensoroni - name: so-sensoroni - binds: diff --git a/salt/soctopus/init.sls b/salt/soctopus/init.sls index 98a9a4158..ebfbe3224 100644 --- a/salt/soctopus/init.sls +++ b/salt/soctopus/init.sls @@ -40,13 +40,13 @@ navigatordefaultlayer: so-soctopusimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-soctopus:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-soctopus:HH1.1.1 so-soctopus: docker_container.running: - require: - so-soctopusimage - - image: soshybridhunter/so-soctopus:HH1.1.1 + - image: docker.io/soshybridhunter/so-soctopus:HH1.1.1 - hostname: soctopus - name: so-soctopus - binds: diff --git a/salt/suricata/init.sls b/salt/suricata/init.sls index 2c3b1aba8..a30010d5e 100644 --- a/salt/suricata/init.sls +++ b/salt/suricata/init.sls @@ -72,13 +72,13 @@ suriconfigsync: so-suricataimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-suricata:HH1.1.1 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-suricata:HH1.1.1 so-suricata: docker_container.running: - require: - so-suricataimage - - image: soshybridhunter/so-suricata:HH1.1.1 + - image: docker.io/soshybridhunter/so-suricata:HH1.1.1 - privileged: True - environment: - INTERFACE={{ interface }} diff --git a/salt/wazuh/init.sls b/salt/wazuh/init.sls index b83240dfa..3169efd3f 100644 --- a/salt/wazuh/init.sls +++ b/salt/wazuh/init.sls @@ -64,13 +64,13 @@ wazuhagentregister: so-wazuhimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-wazuh:HH1.1.0 + - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-wazuh:HH1.1.0 so-wazuh: docker_container.running: - require: - so-wazuhimage - - image: soshybridhunter/so-wazuh:HH1.1.0 + - image: docker.io/soshybridhunter/so-wazuh:HH1.1.0 - hostname: {{HOSTNAME}}-wazuh-manager - name: so-wazuh - detach: True