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

Grammar + misc fixes per PR review

Browse Source 
* Remove unnecessary `apt-get update` commands
* Change `if ! (command); then exit 1; fi` to `command || exit 1` to avoid subshell
This commit is contained in:
William Wernert
2021-02-16 14:17:41 -05:00
parent 3323e900ef
commit 0bd5ddf6a6
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/so-functions
View File

@@ -1958,11 +1958,7 @@ saltify() {
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
yum versionlock salt* yum versionlock salt*
else else
if ! (DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1); then DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1
exit 1
fi
retry 50 10 "apt-get update" >> "$setup_log" 2>&1 || exit 1
if [ $OSVER != "xenial" ]; then if [ $OSVER != "xenial" ]; then
# Switch to Python 3 as default if this is not xenial # Switch to Python 3 as default if this is not xenial

1
setup/so-setup
View File

@@ -130,7 +130,6 @@ if [[ -f automation/$automation && $(basename $automation) == $automation ]]; th
if [[ ! $is_iso ]]; then if [[ ! $is_iso ]]; then
echo "Installing sshpass for automated testing." >> $setup_log 2>&1 echo "Installing sshpass for automated testing." >> $setup_log 2>&1
if [ "$OS" == ubuntu ]; then if [ "$OS" == ubuntu ]; then
retry 50 10 "apt-get update" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-get -y install sshpass" >> $setup_log 2>&1 || exit 1 retry 50 10 "apt-get -y install sshpass" >> $setup_log 2>&1 || exit 1
else else
yum -y install sshpass >> $setup_log 2>&1 yum -y install sshpass >> $setup_log 2>&1

12
setup/so-whiptail
View File

@@ -31,9 +31,15 @@ whiptail_airgap() {
whiptail_avoid_default_hostname() { whiptail_avoid_default_hostname() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
read -r -d '' message <<- EOM
To prevent hostname conflicts, avoid using the default 'securityonion' hostname in a distributed environment.
You can choose to use this default hostname anyway, or change it to a new hostname.
EOM
whiptail --title "Security Onion Setup" \ whiptail --title "Security Onion Setup" \
--yesno "We suggest avoiding the default hostname of 'securityonion' in a distributed environment." 8 75 \ --yesno "$message" 11 75 \
--yes-button "Use" --no-button "Change" --defaultno --yes-button "Use Anyway" --no-button "Change" --defaultno
} }
whiptail_basic_suri() { whiptail_basic_suri() {
@@ -952,7 +958,7 @@ whiptail_metadata_tool() {
If you choose Zeek for metadata, Suricata will still run to generate NIDS alerts. If you choose Zeek for metadata, Suricata will still run to generate NIDS alerts.
If you choose Suricata for metadata, it will generate NIDS alerts and metadata and Zeek will not run at all. If you choose Suricata for metadata, it will generate NIDS alerts and metadata, and Zeek will not run at all.
EOM EOM
# Legacy variable naming # Legacy variable naming