Commit Graph

652 Commits

Author SHA1 Message Date
William Wernert
467f9923b0 [refactor] Add trap to handle script exits, change what files are deleted in /etc/salt/ 2020-12-02 13:19:34 -05:00
William Wernert
2d4fe58299 [fix] Also kill currently running jobs 2020-12-01 21:43:38 -05:00
William Wernert
4b5b936abb [fix] echo -> return 2020-12-01 21:40:41 -05:00
William Wernert
2d6feea5c5 [fix] Syntax fixes 2020-12-01 21:21:32 -05:00
William Wernert
38028a543a [feat] Add timeout for salt services to stop during reinstall init 2020-12-01 21:18:24 -05:00
m0duspwnens
141d7a35c9 if true cluster enabled allow search nodes to talk to each other https://github.com/Security-Onion-Solutions/securityonion/issues/2079 2020-12-01 15:38:09 -05:00
William Wernert
c2e7e42509 [fix] Don't SIGKILL salt services + disable highstate schedule 2020-12-01 15:36:05 -05:00
William Wernert
8a8885e14f [feat] Verify that main ip = mngmt ip
* Add a check to check whether the src ip in the routing table is also the ip assigned to the management nic
2020-11-30 16:53:02 -05:00
Mike Reeves
ddca9563e5 Merge branch 'mkrmerge' into escluster 2020-11-24 10:29:57 -05:00
m0duspwnens
65334d15ea https://github.com/Security-Onion-Solutions/securityonion/issues/2040 2020-11-24 09:33:38 -05:00
William Wernert
ac3b5e4f1b [fix] Remove echo redirect at beginning of install 2020-11-19 09:48:56 -05:00
m0duspwnens
d68726f6ef upgrade from salt 3002.1 to salt 3002.2 2020-11-18 18:25:02 -05:00
William Wernert
1c55bb6db2 [fix] Only backup /nsm/mysql and /nsm/wazuh 2020-11-18 15:34:40 -05:00
William Wernert
e65c53dbb1 [fix] Don't rename /nsm/docker-registry 2020-11-18 14:01:33 -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
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
William Wernert
b146700303 [feat] Remove so-setup permission from sudoers file after iso setup
Closes #1701
2020-11-17 15:36:25 -05:00
William Wernert
12c661101a Merge pull request #1958 from Security-Onion-Solutions/feat/require-min-nics
Feat/require min nics
2020-11-17 09:49:09 -05:00
William Wernert
79b63ed14b [fix] Use singular when needed for requirements 2020-11-17 09:47:08 -05:00
Jason Ertel
3cf8afc1dd Remove unused redirect descriptors and ensure gpg import output is not leaked to console 2020-11-16 16:39:54 -05:00
Jason Ertel
5ae78d4108 Install curl in order to test for cloud 2020-11-16 15:31:40 -05:00
Jason Ertel
3bae243915 Continued refactoring of bash 2020-11-16 15:20:00 -05:00
Jason Ertel
8234b6f835 Switch remaining containers over to new registries; Continued bash refactoring 2020-11-16 15:11:08 -05:00
Jason Ertel
a343e3f31e Save descriptors while inside the progress pipe 2020-11-16 14:10:48 -05:00
Jason Ertel
2ff738a61c Refactor docker_seed_registry to eliminate duplicate logic 2020-11-16 13:27:23 -05:00
Jason Ertel
76c917d977 Continued bash cleanup 2020-11-15 09:57:12 -05:00
Mike Reeves
8577fa63a3 fix network install download 2020-11-13 14:28:27 -05:00
Mike Reeves
52e909007f Change url and clean up sigs 2020-11-12 16:08:27 -05:00
Mike Reeves
cbca2d702f Add Version back to sig files 2020-11-12 11:53:30 -05:00
Mike Reeves
aefcb9a491 Fix Variable for docker 2020-11-12 11:28:58 -05:00
Mike Reeves
312f99966e Change docker inspect to a variable to speed it up 2020-11-12 09:39:13 -05:00
Mike Reeves
2fba02f71b Grab specific digest so re-installs work 2020-11-12 09:29:18 -05:00
Mike Reeves
b113dce140 remove size from gpg sig 2020-11-11 19:49:25 -05:00
Mike Reeves
2269695e75 Change gpg to sig 2020-11-11 15:50:52 -05:00
Mike Reeves
8512042132 Change Sig Path 2020-11-11 15:37:11 -05:00
Mike Reeves
3a622ee71e Hash and sig update 2020-11-11 14:29:47 -05:00
William Wernert
ff4d7a6cb6 [fix] Sync modules so states can use our modules during setup 2020-11-09 14:01:19 -05:00
William Wernert
51256983da [fix] Make sure pip is installed on Ubuntu 2020-11-06 08:53:30 -05:00
William Wernert
d2ea197ce0 [fix] Remove old entry for manager from known_hosts
Resolves #1839
2020-11-05 14:40:00 -05:00
William Wernert
a5833f1f77 Merge branch 'dev' into feature/setup-idempotency
# Conflicts:
#	setup/so-functions
2020-11-05 13:48:05 -05:00
William Wernert
b27b2e358b [fix] Set MSRVIP variable before hosts file is overwritten 2020-11-05 13:38:08 -05:00
William Wernert
915aaf58f2 [fix] Always set MSRVIP because /etc/hosts is wiped 2020-11-05 13:28:21 -05:00
William Wernert
f058fb460d [fix] Don't modify hosts file during whiptail menus 2020-11-05 13:25:02 -05:00
William Wernert
f7394559d4 [fix] Only add entry to /etc/hosts if unable to resolve hostname 2020-11-05 13:16:52 -05:00
Josh Patterson
fea6e6f4f9 Merge branch 'dev' into patch_2.3.3 2020-11-05 09:58:43 -05:00
William Wernert
cb75b2df65 [revert] Remove wazuh-agent package as well 2020-11-04 16:23:51 -05:00
William Wernert
4369b8d0f6 [fix] Remove wazuh-agent package as well 2020-11-04 16:14:58 -05:00
William Wernert
5cb8d0beda [fix] Add -q flag to grep 2020-11-04 14:23:24 -05:00
William Wernert
b4446cba9a [refactor][wip] Also backup directories in /nsm 2020-11-04 14:20:51 -05:00