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
8,971 Commits 24 Branches 119 Tags
c6773a0bbcf679becb87def2bc2916bdc819c6ad
Commit Graph

8971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
m0duspwnens
c6773a0bbc move "Preparing soup" to main so shows in soup.log 2021-12-03 10:26:22 -05:00
m0duspwnens
ff2d2c7c04 export LC_CTYPE="en_US.UTF-8" - https://github.com/Security-Onion-Solutions/securityonion/discussions/6431 2021-12-02 16:39:32 -05:00
Mike Reeves
6c7a1f23f5 Merge pull request #6440 from Security-Onion-Solutions/TOoSmOotH-patch-2 
Fix for the clustername used in wrong context
 2021-12-02 15:35:26 -05:00
Mike Reeves
f5761c73a5 Fix for the clustername used in wrong context 2021-12-02 15:30:35 -05:00
Mike Reeves
8448778ecd Merge pull request #6438 from Security-Onion-Solutions/hf/soc_append2.3.90 
hf/soc append2.3.90
 2021-12-02 15:10:51 -05:00
m0duspwnens
8d667795a7 only add soc:es_index_patterns to pillar if not already present 2021-12-02 10:28:17 -05:00
m0duspwnens
7a664ab8f7 more error proof up_to_2.3.90 function 2021-12-02 10:02:26 -05:00
m0duspwnens
5e0ac89841 merge with master 2021-12-01 14:27:58 -05:00
Mike Reeves
8990a09d92 Merge pull request #6418 from Security-Onion-Solutions/hotfix/2.3.90 
Hotfix/2.3.90
2.3.90-AIRGAPFIX 		2021-12-01 13:24:19 -05:00
Mike Reeves
946673dc3b Merge pull request #6417 from Security-Onion-Solutions/2390updates2 
2.3.90 hotfix airgap
 2021-12-01 13:20:41 -05:00
m0duspwnens
c571b2c499 handle redirect if more than 1 match from compgen 2021-12-01 13:17:14 -05:00
Mike Reeves
80c569317f 2.3.90 hotfix airgap 2021-12-01 13:16:13 -05:00
Mike Reeves
5f121f3b99 Merge pull request #6411 from Security-Onion-Solutions/m0duspwnens-patch-1/hotfix/2.3.90 
remove redirect to /dev/null for compgen
 2021-12-01 10:17:29 -05:00
Josh Patterson
63cb486698 remove redirect to /dev/null for compgen 2021-12-01 10:16:04 -05:00
William Wernert
1a31e60e47 Merge pull request #6402 from Security-Onion-Solutions/fix/airgap-check 
Fix/airgap check
 2021-11-30 15:57:02 -05:00
William Wernert
168f860c87 Add hotfix string to HOTFIX 2021-11-30 15:49:41 -05:00
William Wernert
8d87fae6a8 Remove airgap repo file if it shouldn't exist 2021-11-30 15:46:22 -05:00
William Wernert
739efc22d2 Fix airgap check logic 2021-11-30 15:46:18 -05:00
Mike Reeves
4c6786a412 Merge pull request #6335 from Security-Onion-Solutions/hotfix/2.3.90 
Hotfix/2.3.90
2.3.90-WAZUH 		2021-11-23 16:51:27 -05:00
Mike Reeves
5062e910e2 Merge pull request #6334 from Security-Onion-Solutions/2390updates 
2.3.90 hotfix soup
 2021-11-23 15:41:21 -05:00
Mike Reeves
1f9dc0db1f 2.3.90 hotfix soup 2021-11-23 15:40:04 -05:00
Mike Reeves
c536e11383 2.3.90 hotfix soup 2021-11-23 15:32:41 -05:00
Mike Reeves
faa8464b60 Merge pull request #6333 from Security-Onion-Solutions/kilo 
Correct if check to inline the command instead of checking for emptin…
 2021-11-23 14:53:24 -05:00
Jason Ertel
4f283c2d86 Suppres grep output 2021-11-23 14:52:40 -05:00
Jason Ertel
801d42ed20 Correct if check to inline the command instead of checking for emptiness of a variable 2021-11-23 14:51:06 -05:00
Mike Reeves
30a1ffc1c7 Merge pull request #6329 from Security-Onion-Solutions/kilo 
2.3.90 WAZUH
 2021-11-23 13:37:41 -05:00
Jason Ertel
59fc122eec Force restart of wazuh since conf file is changing 2021-11-23 13:29:04 -05:00
Jason Ertel
52ffa27eda Update hotfix file 2021-11-23 13:22:47 -05:00
Jason Ertel
bd59d65f02 Strip trailing newlines from version and hotfix files 2021-11-23 13:12:27 -05:00
Jason Ertel
01ceded223 Handle CRs in hotfix 2021-11-23 13:03:40 -05:00
Jason Ertel
3c37bd61ab Add debug logging 2021-11-23 12:46:59 -05:00
Jason Ertel
a35670c889 Merge branch 'hotfix/1.3.90' into kilo 2021-11-23 12:38:57 -05:00
Jason Ertel
7627d37386 Add 2.3.90 WAZUH hotfix corrective function 2021-11-23 12:21:28 -05:00
Jason Ertel
273842eb43 Merge pull request #6328 from Security-Onion-Solutions/kilo 
WAZUH hotfix
 2021-11-23 12:06:34 -05:00
Jason Ertel
0dd251e2a9 Fix typo in whiptail prompt 2021-11-23 11:19:53 -05:00
Josh Patterson
c67b2b6936 Update soup 
only check if salt was upgraded if upgrade_salt function was called
 2021-11-23 11:14:10 -05:00
Jason Ertel
af4c04be59 Fix #6325 - Prevent XML header from outputting to ossec.conf 2021-11-23 10:57:21 -05:00
Jason Ertel
4672b0c15c Fix #6317 - Do not attempt to whitelist when wazuh isn't enabled 2021-11-23 10:06:14 -05:00
Jason Ertel
9737a4088c Merge pull request #6327 from Security-Onion-Solutions/TOoSmOotH-patch-1 
Update HOTFIX
 2021-11-23 09:25:43 -05:00
Mike Reeves
d8d429c71a Update HOTFIX 2021-11-23 09:19:41 -05:00
Mike Reeves
3bfc3b8943 Merge pull request #6301 from Security-Onion-Solutions/dev 
2.3.90
2.3.90 		2021-11-22 13:15:23 -05:00
Mike Reeves
4ad6d616ae Merge pull request #6313 from Security-Onion-Solutions/2390update 
2390update
 2021-11-22 09:04:16 -05:00
Mike Reeves
759c0b858a 2.3.90 2021-11-22 09:01:12 -05:00
Mike Reeves
c17a49a730 Merge pull request #6302 from Security-Onion-Solutions/fix/md5soup 
Fix/md5soup
 2021-11-19 16:45:02 -05:00
m0duspwnens
c0f183fb5e add comment 2021-11-19 16:37:27 -05:00
m0duspwnens
d602339c45 render and md5sum soup and so-common 2021-11-19 16:32:59 -05:00
Mike Reeves
0122e62920 Merge pull request #6300 from Security-Onion-Solutions/2390 
2.3.90
 2021-11-19 14:09:02 -05:00
Mike Reeves
1634105780 2.3.90 2021-11-19 14:07:03 -05:00
Josh Patterson
198a690ba1 Merge pull request #6298 from Security-Onion-Solutions/fix/soup-script-check 
Check soup in /usr/sbin rather than the saltstack default dir
 2021-11-19 11:24:48 -05:00
William Wernert
bebd62187d Check soup in /usr/sbin rather than the saltstack default dir 2021-11-19 11:23:32 -05:00