CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 02:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3995 from Security-Onion-Solutions/updateag

Browse Source 
Fix updates for airgap
This commit is contained in:
Mike Reeves
2021-04-25 11:26:20 -04:00
committed by GitHub
parent 0505664b84 4d0b06dfc7
commit abbe0ec819
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/common/tools/sbin/soup
View File

@@ -716,6 +716,8 @@ echo ""
echo "Updating dockers to $NEWVERSION." echo "Updating dockers to $NEWVERSION."
if [ $is_airgap -eq 0 ]; then if [ $is_airgap -eq 0 ]; then
airgap_update_dockers airgap_update_dockers
update_centos_repo
yum clean all
else else
update_registry update_registry
update_docker_containers "soup" update_docker_containers "soup"
@@ -737,10 +739,6 @@ preupgrade_changes_2.3.50_repo
if [ "$UPGRADESALT" == "1" ]; then if [ "$UPGRADESALT" == "1" ]; then
echo "Upgrading Salt" echo "Upgrading Salt"
# Update the repo files so it can actually upgrade # Update the repo files so it can actually upgrade
if [ $is_airgap -eq 0 ]; then
update_centos_repo
yum clean all
fi
upgrade_salt upgrade_salt
fi fi

3
salt/repo/client/init.sls
View File

@@ -16,8 +16,9 @@ airgap_repo:
pkgrepo.managed: pkgrepo.managed:
- humanname: Airgap Repo - humanname: Airgap Repo
- baseurl: https://{{ MANAGER }}/repo - baseurl: https://{{ MANAGER }}/repo
- gpgcheck: 1 - gpgcheck: 0
- sslverify: 0 - sslverify: 0
{% endif %} {% endif %}
# from airgap and common # from airgap and common