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 #6213 from Security-Onion-Solutions/issue/5809

Browse Source 
Issue/5809
This commit is contained in:
Josh Patterson
2021-11-12 15:07:54 -05:00
committed by GitHub
parent 8c46a2d1db cc1dea446c
commit ffbb04bb5a
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,6 +221,19 @@ check_local_mods() {
# {% endraw %} # {% endraw %}
check_pillar_items() {
local pillar_output=$(salt-call pillar.items --out=json)
cond=$(jq '.local | has("_errors")' <<< "$pillar_output")
if [[ "$cond" == "true" ]]; then
printf "\nThere is an issue rendering the manager's pillars. Please correct the issues in the sls files mentioned below before running SOUP again.\n\n"
jq '.local._errors[]' <<< "$pillar_output"
exit 0
else
printf "\nThe manager's pillars can be rendered. We can proceed with SOUP.\n\n"
fi
}
check_sudoers() { check_sudoers() {
if grep -q "so-setup" /etc/sudoers; then if grep -q "so-setup" /etc/sudoers; then
echo "There is an entry for so-setup in the sudoers file, this can be safely deleted using \"visudo\"." echo "There is an entry for so-setup in the sudoers file, this can be safely deleted using \"visudo\"."
@@ -852,6 +865,8 @@ verify_latest_update_script() {
main() { main() {
trap 'check_err $?' EXIT trap 'check_err $?' EXIT
check_pillar_items
echo "Checking to see if this is an airgap install." echo "Checking to see if this is an airgap install."
echo "" echo ""
check_airgap check_airgap