From 7e34595f9969e6ca7483d11f0aa207fe06cebfda Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 21 Apr 2020 15:16:08 -0400 Subject: [PATCH] rename docker container so-core to so-nginx - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587 --- pillar/docker/config.sls | 22 +++++++++---------- salt/common/tools/sbin/so-elastic-download | 2 +- salt/fleet/files/scripts/so-fleet-setup | 2 +- .../files/registry/scripts/so-docker-download | 2 +- salt/nginx/init.sls | 6 ++--- setup/so-functions | 4 ++-- upgrade/so-update-functions | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pillar/docker/config.sls b/pillar/docker/config.sls index a9eebaf2b..3c90b710a 100644 --- a/pillar/docker/config.sls +++ b/pillar/docker/config.sls @@ -10,7 +10,7 @@ eval: containers: - - so-core + - so-nginx - so-telegraf {% if GRAFANA == '1' %} - so-influxdb @@ -54,7 +54,7 @@ eval: {% endif %} heavy_node: containers: - - so-core + - so-nginx - so-telegraf - so-redis - so-logstash @@ -69,7 +69,7 @@ heavy_node: {% endif %} helix: containers: - - so-core + - so-nginx - so-telegraf - so-idstools - so-steno @@ -79,14 +79,14 @@ helix: - so-filebeat hot_node: containers: - - so-core + - so-nginx - so-telegraf - so-logstash - so-elasticsearch - so-curator master_search: containers: - - so-core + - so-nginx - so-telegraf - so-soc - so-kratos @@ -127,7 +127,7 @@ master_search: master: containers: - so-dockerregistry - - so-core + - so-nginx - so-telegraf {% if GRAFANA == '1' %} - so-influxdb @@ -169,12 +169,12 @@ master: {% endif %} parser_node: containers: - - so-core + - so-nginx - so-telegraf - so-logstash search_node: containers: - - so-core + - so-nginx - so-telegraf - so-logstash - so-elasticsearch @@ -185,7 +185,7 @@ search_node: {% endif %} sensor: containers: - - so-core + - so-nginx - so-telegraf - so-steno - so-suricata @@ -196,7 +196,7 @@ sensor: - so-filebeat warm_node: containers: - - so-core + - so-nginx - so-telegraf - so-elasticsearch fleet: @@ -206,6 +206,6 @@ fleet: - so-fleet - so-redis - so-filebeat - - so-core + - so-nginx - so-telegraf {% endif %} \ No newline at end of file diff --git a/salt/common/tools/sbin/so-elastic-download b/salt/common/tools/sbin/so-elastic-download index 9e2c56719..216f51410 100755 --- a/salt/common/tools/sbin/so-elastic-download +++ b/salt/common/tools/sbin/so-elastic-download @@ -2,7 +2,7 @@ MASTER=MASTER VERSION="HH1.1.4" TRUSTED_CONTAINERS=( \ -"so-core:$VERSION" \ +"so-nginx:$VERSION" \ "so-thehive-cortex:$VERSION" \ "so-curator:$VERSION" \ "so-domainstats:$VERSION" \ diff --git a/salt/fleet/files/scripts/so-fleet-setup b/salt/fleet/files/scripts/so-fleet-setup index 3489ea86f..6b49dee03 100644 --- a/salt/fleet/files/scripts/so-fleet-setup +++ b/salt/fleet/files/scripts/so-fleet-setup @@ -41,7 +41,7 @@ sleep 120 echo "Installing launcher via salt..." salt-call state.apply fleet.install_package queue=True >> /root/fleet-setup.log salt-call state.apply filebeat queue=True >> /root/fleet-setup.log -docker stop so-core +docker stop so-nginx salt-call state.apply common queue=True >> /root/fleet-setup.log echo "Fleet Setup Complete - Login here: https://{{ MAIN_HOSTNAME }}" diff --git a/salt/master/files/registry/scripts/so-docker-download b/salt/master/files/registry/scripts/so-docker-download index f6ca8f4e1..3f9faceb6 100644 --- a/salt/master/files/registry/scripts/so-docker-download +++ b/salt/master/files/registry/scripts/so-docker-download @@ -3,7 +3,7 @@ MASTER={{ MASTER }} VERSION="HH1.2.1" TRUSTED_CONTAINERS=( \ -"so-core:$VERSION" \ +"so-nginx:$VERSION" \ "so-cyberchef:$VERSION" \ "so-acng:$VERSION" \ "so-soc:$VERSION" \ diff --git a/salt/nginx/init.sls b/salt/nginx/init.sls index 24bc86057..c630f1097 100644 --- a/salt/nginx/init.sls +++ b/salt/nginx/init.sls @@ -33,10 +33,10 @@ nginxtmp: - group: 939 - makedirs: True -so-core: +so-nginx: docker_container.running: - - image: {{ MASTER }}:5000/soshybridhunter/so-core:{{ VERSION }} - - hostname: so-core + - image: {{ MASTER }}:5000/soshybridhunter/so-nginx:{{ VERSION }} + - hostname: so-nginx - user: socore - binds: - /opt/so:/opt/so:rw diff --git a/setup/so-functions b/setup/so-functions index 3402dd6b1..a3339653d 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -579,7 +579,7 @@ docker_seed_registry() { if [ $INSTALLTYPE != 'HELIXSENSOR' ]; then TRUSTED_CONTAINERS=( \ "so-acng:$VERSION" \ - "so-core:$VERSION" \ + "so-nginx:$VERSION" \ "so-thehive-cortex:$VERSION" \ "so-curator:$VERSION" \ "so-domainstats:$VERSION" \ @@ -614,7 +614,7 @@ docker_seed_registry() { "so-zeek:$VERSION" ) else TRUSTED_CONTAINERS=( \ - "so-core:$VERSION" \ + "so-nginx:$VERSION" \ "so-filebeat:$VERSION" \ "so-idstools:$VERSION" \ "so-logstash:$VERSION" \ diff --git a/upgrade/so-update-functions b/upgrade/so-update-functions index 4f0e48f66..373072a03 100644 --- a/upgrade/so-update-functions +++ b/upgrade/so-update-functions @@ -35,7 +35,6 @@ HOSTNAME=$(hostname) if [ $MASTERCHECK != 'so-helix' ]; then TRUSTED_CONTAINERS=( \ "so-acng:$BUILD$UPDATEVERSION" \ - "so-core:$BUILD$UPDATEVERSION" \ "so-thehive-cortex:$BUILD$UPDATEVERSION" \ "so-curator:$BUILD$UPDATEVERSION" \ "so-domainstats:$BUILD$UPDATEVERSION" \ @@ -53,6 +52,7 @@ if [ $MASTERCHECK != 'so-helix' ]; then "so-logstash:$BUILD$UPDATEVERSION" \ "so-mysql:$BUILD$UPDATEVERSION" \ "so-navigator:$BUILD$UPDATEVERSION" \ + "so-nginx:$BUILD$UPDATEVERSION" \ "so-playbook:$BUILD$UPDATEVERSION" \ "so-redis:$BUILD$UPDATEVERSION" \ "so-soc:$BUILD$UPDATEVERSION" \ @@ -67,10 +67,10 @@ if [ $MASTERCHECK != 'so-helix' ]; then "so-zeek:$BUILD$UPDATEVERSION" ) else TRUSTED_CONTAINERS=( \ - "so-core:$BUILD$UPDATEVERSION" \ "so-filebeat:$BUILD$UPDATEVERSION" \ "so-idstools:$BUILD$UPDATEVERSION" \ "so-logstash:$BUILD$UPDATEVERSION" \ + "so-nginx:$BUILD$UPDATEVERSION" \ "so-redis:$BUILD$UPDATEVERSION" \ "so-steno:$BUILD$UPDATEVERSION" \ "so-suricata:$BUILD$UPDATEVERSION" \