Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Main into Dev #11957

Merged
merged 26 commits into from
Dec 6, 2023
Merged

Merge Main into Dev #11957

Changes from 3 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ece3c36
Update import-evtx-logs.json
chateaulav Nov 29, 2023
a6d20bd
Update HOTFIX
weslambert Nov 29, 2023
317b6cb
Merge pull request #11902 from Security-Onion-Solutions/fix/hotfix_ve…
weslambert Nov 29, 2023
2368e8b
Fix action file names
weslambert Nov 29, 2023
a605c5c
Ensure indices managed by ILM can be managed by Curator
weslambert Nov 29, 2023
32b03f5
Merge pull request #11907 from Security-Onion-Solutions/fix/curator_c…
weslambert Nov 30, 2023
4fc3c85
Merge pull request #11890 from chateaulav/chateaulav-import-evtx-logs…
dougburks Nov 30, 2023
6fa4a69
Remove action changes
weslambert Dec 1, 2023
e36044e
Remove close changes
weslambert Dec 1, 2023
55052c4
Merge pull request #11919 from Security-Onion-Solutions/fix/remove_cu…
weslambert Dec 1, 2023
265cde5
move wait_for_salt_minion for hotfix
m0duspwnens Dec 1, 2023
ace5dff
Merge pull request #11923 from Security-Onion-Solutions/hf_soup
m0duspwnens Dec 1, 2023
38868af
avoid exiting salt when ca state applied in post for 2.4.30
m0duspwnens Dec 4, 2023
11a3e12
Merge pull request #11929 from Security-Onion-Solutions/hf_soup
m0duspwnens Dec 4, 2023
55a8b10
Update soup
TOoSmOotH Dec 4, 2023
0b6ba6d
Update soup
TOoSmOotH Dec 4, 2023
802bf9c
Merge pull request #11931 from Security-Onion-Solutions/TOoSmOotH-pat…
TOoSmOotH Dec 4, 2023
90d9e5b
Update soup
TOoSmOotH Dec 5, 2023
b7227e1
Merge pull request #11939 from Security-Onion-Solutions/TOoSmOotH-pat…
TOoSmOotH Dec 5, 2023
fdd4173
Update soup
TOoSmOotH Dec 5, 2023
9446b75
Update soup
TOoSmOotH Dec 5, 2023
8eaa07a
Merge pull request #11942 from Security-Onion-Solutions/TOoSmOotH-pat…
TOoSmOotH Dec 5, 2023
386e921
2.4.30 hotfix
TOoSmOotH Dec 6, 2023
b878728
Merge pull request #11951 from Security-Onion-Solutions/2.4.30hf3
TOoSmOotH Dec 6, 2023
d7bf52d
Merge pull request #11918 from Security-Onion-Solutions/hotfix/2.4.30
TOoSmOotH Dec 6, 2023
0160cae
Merge branch '2.4/dev' into mergeback
TOoSmOotH Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion salt/manager/tools/sbin/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,9 @@ unmount_update() {

update_airgap_rules() {
# Copy the rules over to update them for airgap.
rsync -av $UPDATE_DIR/agrules/* /nsm/repo/rules/
rsync -av $UPDATE_DIR/agrules/suricata/* /nsm/rules/suricata/
rsync -av $UPDATE_DIR/agrules/yara/* /nsm/rules/yara/
rsync -av $UPDATE_DIR/agrules/sigma/* /nsm/repo/rules/sigma/
}

update_airgap_repo() {
Expand Down
Loading