Commit Graph

9931 Commits

Author SHA1 Message Date
m0duspwnens
2a18059ad9 use quotes 2022-04-11 15:37:07 -04:00
m0duspwnens
01510c184a set_os and set_cron_service_name sooner 2022-04-11 15:36:02 -04:00
m0duspwnens
6ed8694008 dont need to pass -t 2022-04-11 15:11:57 -04:00
m0duspwnens
79dc2374e0 check that salt-master is running before requiring manager 2022-04-11 15:09:00 -04:00
m0duspwnens
a2180a6721 ensure salt-master service is running before proceeding with soup 2022-04-11 15:01:41 -04:00
Josh Patterson
365866c9cc Merge pull request #7750 from Security-Onion-Solutions/issue_7730
ensure bash is used for influx query
2022-04-08 15:26:24 -04:00
m0duspwnens
59d5be682a ensure bash is used for influx query 2022-04-08 15:01:38 -04:00
Mike Reeves
7805311ea2 Merge pull request #7748 from Security-Onion-Solutions/bravo
Bravo
2022-04-08 14:48:54 -04:00
Josh Patterson
8757ca0dfb Merge pull request #7749 from Security-Onion-Solutions/issue/7113
ensure we can grab management ip and display whiptail if we cant
2022-04-08 12:10:54 -04:00
m0duspwnens
3e8c687d61 ensure we can grab management ip and display whiptail if we cant 2022-04-08 12:05:38 -04:00
Jason Ertel
13c9af5a5a Clearing hotfix 2022-04-08 10:23:44 -04:00
Mike Reeves
a5313b330f Merge master into dev 2022-04-08 09:07:46 -04:00
Mike Reeves
0bc3d5d757 Merge pull request #7741 from Security-Onion-Solutions/hotfix/2.3.110
Hotfix/2.3.110 20220407
2.3.110-20220407
2022-04-07 16:30:50 -04:00
Mike Reeves
6d88a5b541 Merge pull request #7740 from Security-Onion-Solutions/hfix0407
2.3.110 hotfix 0407
2022-04-07 16:11:58 -04:00
Mike Reeves
6a28e752f0 2.3.110 hotfix 0407 2022-04-07 16:03:13 -04:00
Josh Brower
ae8d300567 Merge pull request #7738 from Security-Onion-Solutions/feature/idh-allow-multiple-int
Include firewall state
2022-04-07 14:52:31 -04:00
Mike Reeves
2ad3f63cb5 Merge pull request #7739 from Security-Onion-Solutions/TOoSmOotH-patch-2
Update HOTFIX
2022-04-07 14:46:20 -04:00
Mike Reeves
93e04850c4 Update HOTFIX 2022-04-07 14:40:54 -04:00
Josh Brower
36b2d78dfe Include firewall state 2022-04-07 14:02:21 -04:00
Josh Patterson
09e7b5a8bf Merge pull request #7733 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
remove saltstack repo created by bootstrap-salt for ubuntu
2022-04-07 09:05:51 -04:00
m0duspwnens
8fbd16f75d ensure salt.list is absent 2022-04-07 09:03:51 -04:00
m0duspwnens
722b200e16 add retry to apt_update incase running in background 2022-04-07 08:58:07 -04:00
m0duspwnens
b2a98af18b proper formatting 2022-04-07 08:55:30 -04:00
m0duspwnens
be3769fd7c run apt-get update if saltstack.list changes 2022-04-07 08:53:44 -04:00
m0duspwnens
08ac696f14 remove saltstack repo created by bootstrap-salt for ubuntu 2022-04-06 17:38:06 -04:00
Josh Brower
86771e1fe6 Merge pull request #7732 from Security-Onion-Solutions/feature/idh-allow-multiple-int
Feature/idh allow multiple int
2022-04-06 17:21:30 -04:00
Josh Brower
f5e539a05c Initial support for restricting IDH services on MGT IP 2022-04-06 17:16:38 -04:00
Josh Patterson
0c1ac729e1 Merge pull request #7731 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
update the centos repo for airgap prior to applying hotfix
2022-04-06 17:00:09 -04:00
m0duspwnens
833106775f update the centos repo for airgap prior to applying hotfix or standard soup run 2022-04-06 16:53:55 -04:00
Mike Reeves
fbd417b09e Merge pull request #7720 from Security-Onion-Solutions/hotfix/2.3.110
Hotfix/2.3.110
2.3.110-20220405
2022-04-05 20:29:17 -04:00
Mike Reeves
4224d1f258 Merge pull request #7719 from Security-Onion-Solutions/hfix0405
2.3.110 hotfix 0405
2022-04-05 19:17:42 -04:00
Mike Reeves
79175b57fa 2.3.110 hotfix 0405 2022-04-05 19:15:20 -04:00
Josh Patterson
5717382340 Merge pull request #7717 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
use -r for bootstrap-salt for ubuntu
2022-04-05 17:37:22 -04:00
m0duspwnens
cf68aeb36e use -r for bootstrap-salt for ubuntu 2022-04-05 17:35:03 -04:00
Josh Patterson
882eb83fee Merge pull request #7716 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
point to so repo
2022-04-05 17:30:10 -04:00
m0duspwnens
89c7f5b356 point to so repo 2022-04-05 17:28:47 -04:00
Mike Reeves
bed9a20025 Merge pull request #7714 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
proper salt format
2022-04-05 15:45:36 -04:00
m0duspwnens
89518b5939 proper salt format 2022-04-05 15:44:06 -04:00
Mike Reeves
07b14d7fa7 Merge pull request #7713 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
update update_repo function
2022-04-05 15:42:45 -04:00
m0duspwnens
1248ba8924 update update_repo function 2022-04-05 15:40:39 -04:00
Josh Patterson
cbbe3b9248 Merge pull request #7712 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
add deb to saltstack.list
2022-04-05 14:45:46 -04:00
m0duspwnens
b467cde9ad add deb to saltstack.list 2022-04-05 14:42:36 -04:00
Josh Patterson
6d6f328cad Merge pull request #7711 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
manage repo conf for ubuntu
2022-04-05 13:50:32 -04:00
m0duspwnens
020871ef61 update hotfix version 2022-04-05 13:49:28 -04:00
m0duspwnens
e08b13629a manage repo conf for ubuntu 2022-04-05 13:41:26 -04:00
Doug Burks
1e187f0c44 Merge pull request #7703 from Security-Onion-Solutions/hotfix/2.3.110
Hotfix/2.3.110
2.3.110-20220401
2022-04-04 23:37:28 -04:00
Josh Brower
7906c053b1 Initial support for restricting IDH services on MGT IP 2022-04-04 16:46:05 -04:00
Mike Reeves
f5073243f9 Merge pull request #7702 from Security-Onion-Solutions/hfix0401
2.3.110 hotfix 0401
2022-04-04 16:13:08 -04:00
Mike Reeves
0c7a07f5c0 Merge pull request #7667 from Security-Onion-Solutions/analystsetup
Analyst Setup
2022-04-04 16:09:13 -04:00
Mike Reeves
04370a04ce 2.3.110 hotfix 0401 2022-04-04 16:06:20 -04:00