1242 Commits

Author	SHA1	Message	Date
William Wernert	f2a1e89633	Merge branch 'dev' into feature/so-rules	2021-02-22 10:03:14 -05:00
Jason Ertel	7222f1faa5	fix merge issue	2021-02-20 16:41:12 -05:00
Jason Ertel	9d3c82a589	Disable unused features for import installations	2021-02-19 20:14:55 -05:00
Jason Ertel	04b3a20e22	Merge branch 'dev' into delta	2021-02-19 20:12:07 -05:00
Jason Ertel	9302b9302b	Clear salt fileserver cache to ensure the new local.rules file gets picked up on the filesync	2021-02-19 11:13:31 -05:00
Mike Reeves	b4b449aa14	Pull in Suricata changes	2021-02-19 11:01:15 -05:00
William Wernert	9183c0a92c	[feat] Initial so-rules script ... * Quote curly braces in minion pillar, need to add sed function in soup	2021-02-19 09:24:12 -05:00
Jason Ertel	e912b2fd96	Move idstools to run after nginx runs	2021-02-18 12:50:00 -05:00
Josh Patterson	ce313d8dc4	Merge pull request #2992 from Security-Onion-Solutions/issue/2737 ... fix logic for log_size_limit	2021-02-17 10:09:54 -05:00
William Wernert	cda36f178b	Merge pull request #2979 from Security-Onion-Solutions/foxtrot ... Setup fixes/improvements	2021-02-16 17:14:59 -05:00
m0duspwnens	996bf0768b	fix logic for log_size_limit https://github.com/Security-Onion-Solutions/securityonion/issues/2737	2021-02-16 15:40:01 -05:00
William Wernert	0bd5ddf6a6	Grammar + misc fixes per PR review ... * Remove unnecessary `apt-get update` commands * Change `if ! (command); then exit 1; fi` to `command || exit 1` to avoid subshell	2021-02-16 14:17:41 -05:00
William Wernert	3323e900ef	[fix] Fix indent (pt 2)	2021-02-16 11:17:36 -05:00
William Wernert	7a9f801eb1	[fix] Add more apt-get update commands ... Fixes #2962	2021-02-16 10:24:58 -05:00
William Wernert	38a5b86813	Make apt-get syntax consistent	2021-02-16 10:24:07 -05:00
William Wernert	23221065eb	Preset MANAGERUPDATES var for airgap since we don't prompt now	2021-02-16 09:43:54 -05:00
William Wernert	5e8d09be51	[fix] Fix indent	2021-02-16 09:42:35 -05:00
William Wernert	4affb20b27	Give context to metadata tool choice	2021-02-12 13:42:14 -05:00
William Wernert	724f5cad78	Warn user if using "securityonion" as hostname	2021-02-12 12:55:55 -05:00
William Wernert	8323f3f57a	[fix] Fix logic to correctly hide prompt	2021-02-12 12:23:45 -05:00
William Wernert	1ffa7afefa	eval-net answerfile corrections ... * HOSTNAME: standalone -> eval * install_type: STANDALONE -> EVAL	2021-02-11 16:20:29 -05:00
William Wernert	188d844d27	Redirect stderr of minion grep to /dev/null	2021-02-11 13:49:39 -05:00
William Wernert	d9b4c09cf0	[fix] Don't show irrelevant prompts during airgap setup	2021-02-11 10:52:18 -05:00
William Wernert	ce8db8abdb	[fix] Only run salt commands during reinstall if master is configured	2021-02-11 10:51:04 -05:00
Mike Reeves	f8903c2554	Fix extra character	2021-02-10 12:58:02 -05:00
Mike Reeves	9eb1e6a448	Prevent the tun interface from being disabled	2021-02-10 12:51:26 -05:00
Mike Reeves	179efa3a51	Merge pull request #2833 from Security-Onion-Solutions/automation/ami ... Adjust AMI test network	2021-02-02 21:05:34 -05:00
Jason Ertel	91480abaa0	Adjust AMI test network	2021-02-02 17:41:41 -05:00
William Wernert	8f0b0ac936	Merge pull request #2825 from Security-Onion-Solutions/foxtrot ... Setup: dpkg retry, whiptail changes, fix zeek state condition	2021-02-02 14:41:48 -05:00
William Wernert	46581c0528	[fix] Don't use ZEEKVERSION var, check pillar value	2021-02-02 12:45:56 -05:00
William Wernert	2253603544	[fix] Don't try to inherit home net on standalone	2021-02-02 12:11:47 -05:00
Jason Ertel	f736d9f8dd	Adjust automation files for distributed AMI	2021-02-01 15:27:53 -05:00
William Wernert	8f476bbbdd	[fix] Add back removed if statement	2021-02-01 13:11:51 -05:00
William Wernert	daebe90b6e	[fix] fix retry command handling ... * use eval "$cmd" to handle strings correctly * add-apt-repo doesn't need dpkg lock so don't use retry for those lines	2021-02-01 12:06:19 -05:00
William Wernert	02f0ef989b	[fix] <cmd> || <fail_reactor>; exit 1 will always exit, fix this	2021-02-01 11:11:01 -05:00
William Wernert	36ce389202	Remove wait_for_apt, use common retry function to run apt commands	2021-02-01 10:55:14 -05:00
William Wernert	edfd985353	Merge branch 'bugfix/zeek-prompts' into foxtrot	2021-01-29 16:04:56 -05:00
William Wernert	7a3c7322fc	[fix] Only check for ZEEKVERSION on manager installs	2021-01-29 15:36:50 -05:00
Jason Ertel	c055427e40	Add support for image key/sig retries	2021-01-29 11:18:06 -05:00
Jason Ertel	194f480017	Airgap fix for import nodes missing rules	2021-01-28 13:03:47 -05:00
Jason Ertel	f12947362b	Adjust test network IPs	2021-01-28 11:35:10 -05:00
Jason Ertel	bfa6aabc4b	Correct automation for airgap import to avoid infinite loop during setup	2021-01-28 10:38:03 -05:00
Jason Ertel	34c2116669	Adjust test network allocation	2021-01-27 16:02:36 -05:00
m0duspwnens	ffd01d6975	fix if statement for isntalling sshpass	2021-01-26 09:49:19 -05:00
William Wernert	7b2ec05dbf	[fix] Add missing fi	2021-01-25 19:57:34 -05:00
Mike Reeves	3b1cea94d1	Merge branch 'dev' into telegraf3	2021-01-25 19:36:49 -05:00
Mike Reeves	88abd284a7	Fix Conflicts	2021-01-25 19:35:32 -05:00
Mike Reeves	891a7592d8	Fix Conflicts	2021-01-25 19:33:49 -05:00
Mike Reeves	e43a80b9c6	Add EPS and RAID status collection for telegraf	2021-01-25 19:28:30 -05:00
Mike Reeves	4ef38f8d04	Add EPS and RAID status collection for telegraf	2021-01-25 19:14:46 -05:00