Commit Graph

9803 Commits

Author SHA1 Message Date
Mike Reeves
6a28e752f0 2.3.110 hotfix 0407 2022-04-07 16:03:13 -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 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 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
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
04370a04ce 2.3.110 hotfix 0401 2022-04-04 16:06:20 -04:00
Josh Patterson
809bc1858c Merge pull request #7700 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
salt 3004.1 hotfix
2022-04-04 13:32:34 -04:00
m0duspwnens
f9563b2dc4 patch influxdb modules 2022-04-04 12:57:36 -04:00
m0duspwnens
b7aff4f4df remove influxdb state files 2022-04-04 12:28:23 -04:00
m0duspwnens
1e955e0d38 enable highstate before highstate run for hotfix 2022-04-04 11:28:03 -04:00
m0duspwnens
127420b472 hotfix function for 2.3.10 hotfix 1 2022-04-04 10:39:44 -04:00
Josh Patterson
7f4c2687cf Merge pull request #7691 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
remove influx patch state files
2022-04-01 15:58:03 -04:00
m0duspwnens
48e40513ff remove influx patch state files 2022-04-01 15:53:48 -04:00
Josh Patterson
c429423dae Merge pull request #7683 from Security-Onion-Solutions/m0duspwnens-salt-3004.1
Update to salt 3004.1
2022-04-01 11:19:31 -04:00
m0duspwnens
45dd7d4758 salt 3004.1 in setup 2022-04-01 11:17:38 -04:00
Josh Patterson
f71fcdaed7 salt 3004.1 2022-04-01 09:55:55 -04:00
Josh Patterson
d95391505f Update minion.defaults.yaml 2022-04-01 09:55:03 -04:00
Mike Reeves
0b80dad2c0 Merge pull request #7682 from Security-Onion-Solutions/TOoSmOotH-patch-1
Update HOTFIX
2022-04-01 09:53:57 -04:00
Mike Reeves
02a96c409e Update HOTFIX 2022-04-01 09:52:57 -04:00
Mike Reeves
3725130128 Merge pull request #7481 from Security-Onion-Solutions/dev
2.3.110
2.3.110-20220309
2022-03-09 14:44:40 -05:00
Mike Reeves
2c66fa1883 Merge pull request #7482 from Security-Onion-Solutions/kilo
Merge master with .100 hotfix #3 into dev
2022-03-09 12:24:04 -05:00
Jason Ertel
61a3155dfa merge from master 2022-03-09 12:22:24 -05:00
Mike Reeves
99f25deb80 Merge pull request #7480 from Security-Onion-Solutions/2.3.110rel
2.3.110
2022-03-09 12:16:31 -05:00
Mike Reeves
0cb628f565 2.3.110 2022-03-09 12:12:32 -05:00
weslambert
262e68cb75 Merge pull request #7469 from Security-Onion-Solutions/fix/kibana_config_load_template
Add .template extension to ensure we are loading the template and not the resultant file
2022-03-08 21:12:29 -05:00
weslambert
c83b63d0d8 Add .template extension to load template file 2022-03-08 20:53:16 -05:00