214 Commits

Author	SHA1	Message	Date
Jason Ertel	9f0e48e337	Send stderr to /dev/null as well, since it's already been decided this output is unsuited for the logfile based on the comment	2020-06-03 08:55:06 -04:00
Jason Ertel	07c0075fc0	Upgrade containerd.io and docker-ce to match ISO rpms	2020-06-02 08:43:06 -04:00
Jason Ertel	9d5f4049b5	Avoid filtering NIC when it's an empty string	2020-06-02 05:52:03 -04:00
m0duspwnens	a84203be7c	Merge remote-tracking branch 'remotes/origin/dev' into issue/749	2020-05-29 16:38:10 -04:00
m0duspwnens	d7e904e1ab	fix minion_type for *NODE install_type	2020-05-29 16:35:39 -04:00
m0duspwnens	6db8470de7	Merge remote-tracking branch 'remotes/origin/dev' into issue/749	2020-05-29 13:09:49 -04:00
Jason Ertel	6c4946f4e2	Provide option to skip reboot after setup completes	2020-05-28 10:20:44 -04:00
m0duspwnens	091cc8b789	fix how local salt and pillar dirs are created - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749	2020-05-28 08:57:07 -04:00
Jason Ertel	1e5d5397a4	Support multiple command line options for setup, along with dynamic values per option	2020-05-27 19:42:48 -04:00
m0duspwnens	8b83799253	create local dirs sooner - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749	2020-05-27 18:16:02 -04:00
m0duspwnens	63e0a1e8a2	create local salt and pillar dirs - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749	2020-05-27 17:18:17 -04:00
m0duspwnens	59cc927878	Merge remote-tracking branch 'remotes/origin/dev' into issue/749	2020-05-27 15:56:38 -04:00
William Wernert	3712eb0acb	[fix] Redirect so-allow output to log	2020-05-27 15:49:41 -04:00
m0duspwnens	6e5aa0f71b	Merge remote-tracking branch 'remotes/origin/dev' into issue/749	2020-05-27 15:08:11 -04:00
m0duspwnens	16c6b2b202	dont allow addtotab to run grafana and utility states if it is initial setup - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749	2020-05-27 15:07:49 -04:00
William Wernert	769f5674eb	[fix] Always call set_default_log_size	2020-05-27 14:08:27 -04:00
m0duspwnens	40f04ef6d0	merge with dev and fix conflicts	2020-05-27 13:54:08 -04:00
m0duspwnens	21f1b423f3	move where in the process addtotab template and data directory are created - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749	2020-05-27 13:43:55 -04:00
William Wernert	1952246c85	[feat] Add flag to run so-allow automatically post-setup	2020-05-27 13:23:37 -04:00
m0duspwnens	23e9ee46b8	Merge remote-tracking branch 'remotes/origin/dev' into issue/749	2020-05-27 12:30:40 -04:00
m0duspwnens	f35c59e6ce	apply firewall state before we addtotab	2020-05-27 12:22:21 -04:00
Jason Ertel	9cc2614cc8	Automated setup will now output progress data to sosetup.log	2020-05-27 11:47:22 -04:00
m0duspwnens	446e0f6f4c	Merge remote-tracking branch 'remotes/origin/dev' into issue/749	2020-05-27 10:09:36 -04:00
William Wernert	377d8e6336	[fix] Don't run tr on a string again	2020-05-26 16:54:51 -04:00
William Wernert	00681649bd	[fix] Don't run tr on a string again	2020-05-26 16:41:41 -04:00
William Wernert	17970beebc	Merge branch 'dev' into feature/turbo-proxy ... # Conflicts: # setup/so-functions	2020-05-26 16:37:08 -04:00
William Wernert	ec0ec79470	[fix] Test install type after it has been set	2020-05-26 16:23:06 -04:00
Jason Ertel	8e1bd32f4d	Improve automated installs and remove sleep during progress updates	2020-05-26 16:11:35 -04:00
William Wernert	001f7c6694	[fix] export TURBO var so it can be used from so-setup	2020-05-26 16:01:44 -04:00
William Wernert	9e1ed6983f	[fix] Parse options at beginning of setup	2020-05-26 15:25:30 -04:00
William Wernert	84e3ce508e	[fix] Only check for proxy-user & proxy-pass when needed	2020-05-26 15:19:37 -04:00
William Wernert	92c6a52496	[feat][WIP] Add functionality to run setup through a proxy	2020-05-26 14:49:22 -04:00
m0duspwnens	fafb469b5c	change from default to local - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749	2020-05-26 11:59:00 -04:00
Mike Reeves	31b3563fb3	Fix package versions	2020-05-24 10:56:30 -04:00
Mike Reeves	1c207afb31	Define packages in the common state	2020-05-23 12:00:24 -04:00
William Wernert	13423bed18	[fix] Add indent in proxy.conf	2020-05-22 16:35:16 -04:00
William Wernert	9a1e122c19	Merge pull request #759 from Security-Onion-Solutions/feature/turbo-proxy ... Feature/turbo proxy	2020-05-22 16:31:20 -04:00
William Wernert	d9feb0d95c	[fix] Don't repeat protocol in daemon.json	2020-05-22 15:09:04 -04:00
William Wernert	ad96baab55	[feat] Trim quotes from arguments	2020-05-22 14:50:58 -04:00
William Wernert	08564ed6d4	[feat] Trim quotes from arguments	2020-05-22 14:50:42 -04:00
William Wernert	862631b93a	[fix] Add space in daemon.json	2020-05-22 14:47:00 -04:00
Jason Ertel	19cd57bce0	Support automated setup	2020-05-22 14:44:57 -04:00
William Wernert	579b622935	[fix] Don't overwrite daemon.json, and only accept turbo mode on correct install types	2020-05-22 14:36:55 -04:00
William Wernert	78f6261fcc	[fix] acng should be port 3142 not 3412	2020-05-22 14:00:01 -04:00
William Wernert	4b505827b1	[fix] Use correct ports for acng and docker registry	2020-05-22 13:31:58 -04:00
William Wernert	c790b3827d	[fix] yum.conf proxy should not contain quotes	2020-05-22 13:25:17 -04:00
William Wernert	b029d9aca6	[feat] Initial work for running setup through proxy	2020-05-22 11:40:16 -04:00
m0duspwnens	d0242c1da6	update references of /opt/so/saltstack to /opt/so/saltstack/default. use var default_salt_dir where appropriate - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749	2020-05-21 10:54:47 -04:00
Josh Patterson	07560463de	Merge pull request #737 from Security-Onion-Solutions/quickfix/wazuh ... https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/695	2020-05-19 13:27:52 -04:00
William Wernert	3b3072b002	[fix] Update filtered nic list before trying to flush unused nics	2020-05-19 11:23:59 -04:00