diff --git a/salt/common/scripts/dockernet.sh b/salt/common/scripts/dockernet.sh deleted file mode 100755 index b317e4006..000000000 --- a/salt/common/scripts/dockernet.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ ! -f /opt/so/state/dockernet.state ]; then - docker network create -d bridge so-elastic-net - touch /opt/so/state/dockernet.state -else - exit -fi diff --git a/salt/common/tools/sbin/so-features-enable b/salt/common/tools/sbin/so-features-enable index 65e9bcec7..3590fca22 100755 --- a/salt/common/tools/sbin/so-features-enable +++ b/salt/common/tools/sbin/so-features-enable @@ -79,7 +79,7 @@ do docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION$SUFFIX # Get signature - curl https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/$BRANCH/sigs/images/$VERSION/$i:$VERSION$SUFFIX.sig --output $SIGNPATH/$i:$VERSION$SUFFIX.sig + curl https://sigs.securityonion.net/$VERSION/$i:$VERSION$SUFFIX.sig --output $SIGNPATH/$i:$VERSION$SUFFIX.sig if [[ $? -ne 0 ]]; then echo "Unable to pull signature file for $i:$VERSION$SUFFIX" exit 1 diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common index fe89a0c4a..c10f255f8 100755 --- a/salt/common/tools/sbin/so-image-common +++ b/salt/common/tools/sbin/so-image-common @@ -106,7 +106,7 @@ update_docker_containers() { docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION # Get signature - curl https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/$BRANCH/sigs/images/$VERSION/$i:$VERSION.sig --output $SIGNPATH/$i:$VERSION.sig + curl https://sigs.securityonion.net/$VERSION/$i:$VERSION.sig --output $SIGNPATH/$i:$VERSION.sig if [[ $? -ne 0 ]]; then echo "Unable to pull signature file for $i:$VERSION" exit 1 diff --git a/setup/so-functions b/setup/so-functions index 86233b4de..00b7ea28c 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -952,18 +952,18 @@ docker_seed_registry() { docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION # Get signature - curl https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/$BRANCH/sigs/images/$VERSION/$i:$VERSION.sig --output $SIGNPATH/$i:$VERSION.sig + curl https://sigs.securityonion.net/$VERSION/$i:$VERSION.sig --output $SIGNPATH/$i:$VERSION.sig if [[ $? -ne 0 ]]; then echo "Unable to pull signature file for $i:$VERSION" exit 1 fi # Dump our hash values - DOCKERINSPECT=$(docker inspect $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION) + DOCKERINSPECT=$(docker inspect $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION) - echo "$DOCKERINSPECT" | jq ".[0].RepoDigests[] | select(. | contains(\"$CONTAINER_REGISTRY\"))" > $SIGNPATH/$i:$VERSION.txt - echo "$DOCKERINSPECT" | jq ".[0].Created, .[0].RootFS.Layers" >> $SIGNPATH/$i:$VERSION.txt + echo "$DOCKERINSPECT" | jq ".[0].RepoDigests[] | select(. | contains(\"$CONTAINER_REGISTRY\"))" > $SIGNPATH/$i:$VERSION.txt + echo "$DOCKERINSPECT" | jq ".[0].Created, .[0].RootFS.Layers" >> $SIGNPATH/$i:$VERSION.txt - if [[ $? -ne 0 ]]; then + if [[ $? -ne 0 ]]; then echo "Unable to inspect $i" exit 1 fi diff --git a/sigs/images/2.3.10/so-acng.sig b/sigs/images/2.3.10/so-acng.sig deleted file mode 100644 index a4c70c3eb..000000000 Binary files a/sigs/images/2.3.10/so-acng.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-curator.sig b/sigs/images/2.3.10/so-curator.sig deleted file mode 100644 index 04319eb5a..000000000 Binary files a/sigs/images/2.3.10/so-curator.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-domainstats.sig b/sigs/images/2.3.10/so-domainstats.sig deleted file mode 100644 index 40af186c8..000000000 Binary files a/sigs/images/2.3.10/so-domainstats.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-elastalert.sig b/sigs/images/2.3.10/so-elastalert.sig deleted file mode 100644 index 2c1eade9e..000000000 Binary files a/sigs/images/2.3.10/so-elastalert.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-elasticsearch.sig b/sigs/images/2.3.10/so-elasticsearch.sig deleted file mode 100644 index 522092f3f..000000000 Binary files a/sigs/images/2.3.10/so-elasticsearch.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-filebeat.sig b/sigs/images/2.3.10/so-filebeat.sig deleted file mode 100644 index b543d8310..000000000 Binary files a/sigs/images/2.3.10/so-filebeat.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-fleet-launcher.sig b/sigs/images/2.3.10/so-fleet-launcher.sig deleted file mode 100644 index e1360dab4..000000000 Binary files a/sigs/images/2.3.10/so-fleet-launcher.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-fleet.sig b/sigs/images/2.3.10/so-fleet.sig deleted file mode 100644 index 77326a44f..000000000 Binary files a/sigs/images/2.3.10/so-fleet.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-freqserver.sig b/sigs/images/2.3.10/so-freqserver.sig deleted file mode 100644 index c082343fc..000000000 Binary files a/sigs/images/2.3.10/so-freqserver.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-grafana.sig b/sigs/images/2.3.10/so-grafana.sig deleted file mode 100644 index d8fd39810..000000000 Binary files a/sigs/images/2.3.10/so-grafana.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-idstools.sig b/sigs/images/2.3.10/so-idstools.sig deleted file mode 100644 index c8bb591f8..000000000 Binary files a/sigs/images/2.3.10/so-idstools.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-influxdb.sig b/sigs/images/2.3.10/so-influxdb.sig deleted file mode 100644 index 4746d5f82..000000000 Binary files a/sigs/images/2.3.10/so-influxdb.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-kibana.sig b/sigs/images/2.3.10/so-kibana.sig deleted file mode 100644 index ec6539f55..000000000 Binary files a/sigs/images/2.3.10/so-kibana.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-kratos.sig b/sigs/images/2.3.10/so-kratos.sig deleted file mode 100644 index ff10115bb..000000000 Binary files a/sigs/images/2.3.10/so-kratos.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-logstash.sig b/sigs/images/2.3.10/so-logstash.sig deleted file mode 100644 index 54cb8d2b8..000000000 Binary files a/sigs/images/2.3.10/so-logstash.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-minio.sig b/sigs/images/2.3.10/so-minio.sig deleted file mode 100644 index 7826b69cf..000000000 Binary files a/sigs/images/2.3.10/so-minio.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-mysql.sig b/sigs/images/2.3.10/so-mysql.sig deleted file mode 100644 index 669e70276..000000000 Binary files a/sigs/images/2.3.10/so-mysql.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-nginx.sig b/sigs/images/2.3.10/so-nginx.sig deleted file mode 100644 index 1f42909b3..000000000 Binary files a/sigs/images/2.3.10/so-nginx.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-pcaptools.sig b/sigs/images/2.3.10/so-pcaptools.sig deleted file mode 100644 index 8755e142b..000000000 Binary files a/sigs/images/2.3.10/so-pcaptools.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-playbook.sig b/sigs/images/2.3.10/so-playbook.sig deleted file mode 100644 index 0a3d50140..000000000 Binary files a/sigs/images/2.3.10/so-playbook.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-redis.sig b/sigs/images/2.3.10/so-redis.sig deleted file mode 100644 index 73d8e2191..000000000 Binary files a/sigs/images/2.3.10/so-redis.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-soc.sig b/sigs/images/2.3.10/so-soc.sig deleted file mode 100644 index 56218b69b..000000000 Binary files a/sigs/images/2.3.10/so-soc.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-soctopus.sig b/sigs/images/2.3.10/so-soctopus.sig deleted file mode 100644 index af780c3ed..000000000 Binary files a/sigs/images/2.3.10/so-soctopus.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-steno.sig b/sigs/images/2.3.10/so-steno.sig deleted file mode 100644 index a3d9704e0..000000000 Binary files a/sigs/images/2.3.10/so-steno.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-strelka-backend.sig b/sigs/images/2.3.10/so-strelka-backend.sig deleted file mode 100644 index b7177d12d..000000000 Binary files a/sigs/images/2.3.10/so-strelka-backend.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-strelka-filestream.sig b/sigs/images/2.3.10/so-strelka-filestream.sig deleted file mode 100644 index 23a221738..000000000 Binary files a/sigs/images/2.3.10/so-strelka-filestream.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-strelka-frontend.sig b/sigs/images/2.3.10/so-strelka-frontend.sig deleted file mode 100644 index aa858871e..000000000 Binary files a/sigs/images/2.3.10/so-strelka-frontend.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-strelka-manager.sig b/sigs/images/2.3.10/so-strelka-manager.sig deleted file mode 100644 index 51db7bba9..000000000 Binary files a/sigs/images/2.3.10/so-strelka-manager.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-suricata.sig b/sigs/images/2.3.10/so-suricata.sig deleted file mode 100644 index d94b58866..000000000 Binary files a/sigs/images/2.3.10/so-suricata.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-tcpreplay.sig b/sigs/images/2.3.10/so-tcpreplay.sig deleted file mode 100644 index b8c02f2ec..000000000 Binary files a/sigs/images/2.3.10/so-tcpreplay.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-telegraf.sig b/sigs/images/2.3.10/so-telegraf.sig deleted file mode 100644 index ec5f07070..000000000 Binary files a/sigs/images/2.3.10/so-telegraf.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-thehive-cortex.sig b/sigs/images/2.3.10/so-thehive-cortex.sig deleted file mode 100644 index 7d3321db0..000000000 Binary files a/sigs/images/2.3.10/so-thehive-cortex.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-thehive-es.sig b/sigs/images/2.3.10/so-thehive-es.sig deleted file mode 100644 index 55258326f..000000000 Binary files a/sigs/images/2.3.10/so-thehive-es.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-thehive.sig b/sigs/images/2.3.10/so-thehive.sig deleted file mode 100644 index 4a5a20eba..000000000 Binary files a/sigs/images/2.3.10/so-thehive.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-wazuh.sig b/sigs/images/2.3.10/so-wazuh.sig deleted file mode 100644 index f726bd63d..000000000 Binary files a/sigs/images/2.3.10/so-wazuh.sig and /dev/null differ diff --git a/sigs/images/2.3.10/so-zeek.sig b/sigs/images/2.3.10/so-zeek.sig deleted file mode 100644 index f88f86a0f..000000000 Binary files a/sigs/images/2.3.10/so-zeek.sig and /dev/null differ