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

Merge pull request #9942 from Security-Onion-Solutions/guifixes

Browse Source 
Fix Repo Issues and Change curl to check for Salt ports
This commit is contained in:
Mike Reeves
2023-03-16 15:59:47 -04:00
committed by GitHub
parent 336cf3ccf8 d12367ed75
commit e88d459ef4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup/so-functions
View File

@@ -139,11 +139,11 @@ check_admin_pass() {
check_manager_connection() { check_manager_connection() {
# See if you can curl the manager. If not you can either try again or continue # See if you can curl the manager. If not you can either try again or continue
info "Checking manager connectivity" info "Checking manager connectivity"
man_test_err=$(curl -k -L -sS https://$MSRVIP/repo --connect-timeout 5 2>&1) man_test_err=$(curl -s $MSRVIP:4505 --connect-timeout 5 2>&1)
local ret=$? local ret=$?
if [[ $ret != 0 ]]; then if [[ $ret != 1 ]]; then
error "Could not reach $MSRV" error "Could not reach $MSRV"
whiptail_manager_unreachable whiptail_manager_unreachable
fi fi
@@ -1983,7 +1983,7 @@ repo_sync_local() {
echo "gpgcheck=1" >> /root/repodownload.conf echo "gpgcheck=1" >> /root/repodownload.conf
echo "gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub" >> /root/repodownload.conf echo "gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub" >> /root/repodownload.conf
dnf repolist logCmd "dnf repolist"
# Make sure we can get to the sig repo # 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/checkup" logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)/1' https://sigs.securityonion.net/checkup --output /tmp/checkup"
logCmd "dnf reposync --norepopath -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" logCmd "dnf reposync --norepopath -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/"
@@ -2381,7 +2381,7 @@ update_sudoers() {
update_packages() { update_packages() {
if [[ $is_rocky ]]; then if [[ $is_rocky ]]; then
logCmd "dnf repolist" logCmd "dnf repolist"
logCmd "dnf -y update --exclude=salt*,wazuh*,docker*,containerd*" logCmd "dnf -y update --allowerasing --exclude=salt*,wazuh*,docker*,containerd*"
else else
retry 150 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1 retry 150 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1
retry 150 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1 retry 150 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1

4
setup/so-whiptail
View File

@@ -1143,11 +1143,13 @@ whiptail_reinstall() {
read -r -d '' message <<- EOM read -r -d '' message <<- EOM
Setup has detected a previous install. Continuing the install will remove the previous install configuration. Setup has detected a previous install. Continuing the install will remove the previous install configuration.
Selecting continue is a destructive action.
Would you like to continue? Would you like to continue?
EOM EOM
whiptail --title "$whiptail_title" \ whiptail --title "$whiptail_title" \
--yesno "$message" 11 75 \ --yesno "$message" 13 75 \
--yes-button "Continue" --no-button "Exit" --defaultno --yes-button "Continue" --no-button "Exit" --defaultno
local exitstatus=$? local exitstatus=$?