From 09f3199cc2a9bf7dd15ab93d6e5c42c8a71d8620 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 13 Nov 2020 13:39:52 -0500 Subject: [PATCH] Change user agent string for docker refresh --- salt/common/tools/sbin/so-docker-refresh | 1 + salt/common/tools/sbin/so-image-common | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-docker-refresh b/salt/common/tools/sbin/so-docker-refresh index b39513990..cf1b1a117 100755 --- a/salt/common/tools/sbin/so-docker-refresh +++ b/salt/common/tools/sbin/so-docker-refresh @@ -45,4 +45,5 @@ version_check HOSTNAME=$(hostname) # List all the containers container_list +CURLTYPE=refresh update_docker_containers diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common index c10f255f8..c1b6fae8f 100755 --- a/salt/common/tools/sbin/so-image-common +++ b/salt/common/tools/sbin/so-image-common @@ -87,6 +87,14 @@ container_list() { fi } +operating_system() { + if [ -f /etc/redhat-release ]; then + OS=CentOS + else + OS=Ubuntu + fi +} + update_docker_containers() { # Let's make sure we have the public key curl -sSL https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS | gpg --import - @@ -106,7 +114,7 @@ update_docker_containers() { docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION # Get signature - curl https://sigs.securityonion.net/$VERSION/$i:$VERSION.sig --output $SIGNPATH/$i:$VERSION.sig + curl -A "$OS $CURLTYPE" 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