From 72d01b13edc2e3316771b7ab88f3d9036b620bed Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 27 Mar 2023 10:12:13 -0400 Subject: [PATCH 1/3] Modify reposync useragent --- salt/manager/files/so-repo-sync | 2 +- setup/so-functions | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/manager/files/so-repo-sync b/salt/manager/files/so-repo-sync index 051a1fff7..3e129cd0d 100644 --- a/salt/manager/files/so-repo-sync +++ b/salt/manager/files/so-repo-sync @@ -11,6 +11,6 @@ set_version set_os salt_minion_count -curl --retry 5 --retry-delay 60 -A 'checkin/$VERSION/$OS/$(uname -r)/$MINIONCOUNT' https://sigs.securityonion.net/checkup --output /tmp/checkup +curl --retry 5 --retry-delay 60 -A "reposync/$VERSION/$OS/$(uname -r)/$MINIONCOUNT" https://sigs.securityonion.net/checkup --output /tmp/checkup dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/ createrepo /nsm/repo \ No newline at end of file diff --git a/setup/so-functions b/setup/so-functions index 18db0b7b4..0cd9a17bb 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1975,7 +1975,8 @@ repo_sync_local() { logCmd "dnf repolist" # Make sure we can get to the sig repo - logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)/1' https://sigs.securityonion.net/checkup --output /tmp/install" + # TODO Add if for ISO install + curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install logCmd "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" # Run it again and make sure we got allt he things logCmd "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" From 16025512952f68473984a999d03e290afba25c73 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 27 Mar 2023 10:14:32 -0400 Subject: [PATCH 2/3] Modify reposync useragent --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 0cd9a17bb..b4965cc8d 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1976,7 +1976,7 @@ repo_sync_local() { logCmd "dnf repolist" # Make sure we can get to the sig repo # TODO Add if for ISO install - curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install + curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install logCmd "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" # Run it again and make sure we got allt he things logCmd "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" From 2a288c7e4aebb2333ee7c133eb8740f53a9c2b34 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 27 Mar 2023 10:18:57 -0400 Subject: [PATCH 3/3] Update so-functions --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index b4965cc8d..307a03d8f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1976,7 +1976,7 @@ repo_sync_local() { logCmd "dnf repolist" # Make sure we can get to the sig repo # TODO Add if for ISO install - curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install + curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install logCmd "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" # Run it again and make sure we got allt he things logCmd "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/"