Commit Graph

5630 Commits

Author SHA1 Message Date
William Wernert
d3ef46a5f6 Merge pull request #2020 from Security-Onion-Solutions/bugfix/pre-whiptail-message
[fix] Remove echo redirect at beginning of install
2020-11-20 10:15:24 -05:00
Jason Ertel
9fb8a6d482 Increment version to 2.3.20 2020-11-19 16:53:34 -05:00
Mike Reeves
4051111999 Update hashes and keys 2020-11-19 16:00:40 -05:00
Mike Reeves
316a1c02f1 Update soup to display what its doing 2020-11-19 15:19:50 -05:00
Josh Patterson
c07f62f8d1 Merge pull request #2007 from Security-Onion-Solutions/fix/minon
kill salt process with soup and dont restart salt-minion service when…
2020-11-19 15:17:58 -05:00
m0duspwnens
cdc7a5cc7c kill salt process with soup and dont restart salt-minion service when salt upgrade 2020-11-19 15:17:11 -05:00
Josh Patterson
10a3e6f414 Merge pull request #2006 from Security-Onion-Solutions/fix/minon
change typo on minon to minion
2020-11-19 15:11:16 -05:00
m0duspwnens
2a3951ab36 change typo on minon to minion 2020-11-19 15:08:08 -05:00
Mike Reeves
67a8c4e8cb Update Readme 2020-11-19 11:27:15 -05:00
Mike Reeves
177819447b Update Sigs and Hashes 2020-11-19 11:26:08 -05:00
Mike Reeves
3be1c9ae32 Clean up 2.3.1 dockers 2020-11-19 09:58:08 -05:00
William Wernert
ac3b5e4f1b [fix] Remove echo redirect at beginning of install 2020-11-19 09:48:56 -05:00
Josh Brower
b79e1c3225 Merge pull request #1987 from Security-Onion-Solutions/bugfix/playbookdb-user
playbook mysqluser
2020-11-18 20:48:49 -05:00
Josh Brower
d3065005ca playbook mysqluser 2020-11-18 20:48:02 -05:00
Josh Patterson
26e97d5875 Merge pull request #1984 from Security-Onion-Solutions/salt/3002.2
upgrade from salt 3002.1 to salt 3002.2
2020-11-18 18:26:11 -05:00
m0duspwnens
d68726f6ef upgrade from salt 3002.1 to salt 3002.2 2020-11-18 18:25:02 -05:00
Josh Patterson
f81da406da Merge pull request #1983 from Security-Onion-Solutions/soup-verify-salt
dont highstate, just restart salt-minion
2020-11-18 17:40:36 -05:00
m0duspwnens
afd466cd2b dont highstate, just restart salt-minion 2020-11-18 17:27:25 -05:00
Josh Patterson
6d228a836f Merge pull request #1982 from Security-Onion-Solutions/soup-verify-salt
add -X so bootstrap doesnt try to start salt-minion during soup
2020-11-18 16:45:05 -05:00
m0duspwnens
1805effdc0 add -X so bootstrap doesnt try to start salt-minion during soup 2020-11-18 16:32:53 -05:00
Jason Ertel
1170b04a87 Update changes for 2.3.10 2020-11-18 16:18:00 -05:00
Josh Patterson
c0b43d3319 Merge pull request #1981 from Security-Onion-Solutions/soup-verify-salt
add back -s
2020-11-18 15:50:04 -05:00
m0duspwnens
6cc9d1c076 add back -s 2020-11-18 15:49:30 -05:00
William Wernert
1c55bb6db2 [fix] Only backup /nsm/mysql and /nsm/wazuh 2020-11-18 15:34:40 -05:00
Josh Brower
3d0003555a Merge pull request #1980 from Security-Onion-Solutions/bugfix/soup-regen-osquery
SOUP - Regen Osquery Packages
2020-11-18 14:56:23 -05:00
Josh Brower
0830f63c4e SOUP - Regen Osquery Packages 2020-11-18 14:55:14 -05:00
Josh Patterson
adbd8d6956 Merge pull request #1979 from Security-Onion-Solutions/soup-verify-salt
Soup verify salt
2020-11-18 14:49:03 -05:00
William Wernert
80d0080f70 [fix] Only set is_reinstall if it's needed 2020-11-18 14:47:53 -05:00
m0duspwnens
af6e14dc6f highstate , merge with dev fix conflict 2020-11-18 14:47:40 -05:00
William Wernert
8b6b7cbd11 [fix] Check if $is_reinstall is true 2020-11-18 14:46:22 -05:00
William Wernert
e65c53dbb1 [fix] Don't rename /nsm/docker-registry 2020-11-18 14:01:33 -05:00
m0duspwnens
ceef07b74b remove pkill 2020-11-18 14:00:01 -05:00
William Wernert
280cde43ff [fix] install_type -> setup_type 2020-11-18 13:51:55 -05:00
William Wernert
81b9658499 [fix] Don't remove accept_changes file 2020-11-18 13:51:55 -05:00
weslambert
04c6bed779 Merge pull request #1977 from Security-Onion-Solutions/fix/zeek_log_inode_cleanup
Change clean_removed to true to clean up tracking of Zeek logs removed fr…
2020-11-18 13:49:46 -05:00
weslambert
6b4af30fc1 Change clean_removed to true cleanup tracking of Zeek logs removed from current 2020-11-18 13:47:32 -05:00
m0duspwnens
1e2b404836 remove -s 2020-11-18 13:29:42 -05:00
m0duspwnens
276c011a4f queue state and change upgrade command https://github.com/Security-Onion-Solutions/securityonion/issues/1961 2020-11-18 13:22:11 -05:00
William Wernert
34fd80182e [fix][wip] Don't use variable for accept_changes file 2020-11-18 12:54:36 -05:00
Jason Ertel
57e9f69c97 Add new so-ip-update script (Work in progress) 2020-11-18 12:35:38 -05:00
William Wernert
0542e0aa04 [fix] info -> title 2020-11-18 12:35:16 -05:00
m0duspwnens
d0e7b5b55a only ensure salt-minion service is running if salt is on right verison https://github.com/Security-Onion-Solutions/securityonion/issues/1961 2020-11-18 12:32:21 -05:00
William Wernert
ad74b4b3e0 [refactor][fix] Update reinstall logic
* Only set reinstall flag if new accept_changes file exists
* Instead of stopping highstate from running, kill all salt processes and remove their configs
* Make end of non-reinstall logs clear in cases where user cancels (and log not rotated)
2020-11-18 12:29:54 -05:00
m0duspwnens
ce70e0a61f changes to upgradecommand https://github.com/Security-Onion-Solutions/securityonion/issues/1961 2020-11-18 11:51:28 -05:00
William Wernert
8a4defcffa [refactor] Check for setup log earlier
* Check for sosetuo.log before any scripts besides so-variables are sourced to make sure the log hasn't been created yet.
2020-11-18 11:16:36 -05:00
m0duspwnens
bddc3d6df9 kill all salt-minion again since they hang and redirect highstate to a logfile 2020-11-18 10:40:23 -05:00
m0duspwnens
4bb1ad9799 dont restart or kill salt-minon in upgrade command https://github.com/Security-Onion-Solutions/securityonion/issues/1961 2020-11-18 09:29:09 -05:00
William Wernert
bc0c395b7f Merge pull request #1963 from Security-Onion-Solutions/feature/rem-so-setup-perm-entry
Feature/rem so-setup perm entry
2020-11-18 09:12:25 -05:00
m0duspwnens
67dc71ab49 Merge remote-tracking branch 'remotes/origin/dev' into soup-verify-salt 2020-11-18 08:36:23 -05:00
m0duspwnens
c95619d335 change upgradecommand order https://github.com/Security-Onion-Solutions/securityonion/issues/1961 2020-11-18 08:35:56 -05:00