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

fix nginx merge conflicts

Browse Source
This commit is contained in:
m0duspwnens committed 2023-05-15 11:40:12 -04:00
2 parents db47256cdd 9a3c997779
commit 7a4fea7a12
46 files changed
+234 -174
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

salt/manager/tools/sbin/soup
+1 -1
View File
@@ -202,7 +202,7 @@ check_local_mods() {
default_file="${DEFAULT_SALT_DIR}${stripped_path}"
if [[ -f $default_file ]]; then
file_diff=$(diff "$default_file" "$local_file" )
if [[ $(echo "$file_diff" | grep -c "^<") -gt 0 ]]; then
if [[ $(echo "$file_diff" | grep -Ec "^[<>]") -gt 0 ]]; then
local_mod_arr+=( "$local_file" )
fi
fi