1286 Commits

Author	SHA1	Message	Date
William Wernert	9f2adfb67a	Merge branch 'master' into merge_2.3.52 ... # Conflicts: # VERSION	2021-06-07 14:08:17 -04:00
Mike Reeves	31365b266a	Update so-zeek-stats	2021-06-03 13:53:11 -04:00
William Wernert	bb5b805983	Merge branch 'fix/missing-version-string' into foxtrot	2021-06-03 10:45:02 -04:00
William Wernert	b3f2c60065	Whiptail title fixes ... - Use a variable for the title - Fix cases where the whiptail title wasn't changed previously	2021-06-02 12:38:32 -04:00
William Wernert	afbf7de9e3	Remove empty lines in iso location prompt	2021-06-02 11:05:43 -04:00
William Wernert	91c8a7c65b	Use correct syntax for tar to drop directory structure	2021-06-01 12:16:56 -04:00
William Wernert	e800d62df4	Merge branch 'dev' into fix/update-iso-soup-wording	2021-06-01 11:12:17 -04:00
Josh Brower	ed249600d3	Merge remote-tracking branch 'remotes/origin/dev' into feature/so-pcap-pull	2021-05-26 09:52:58 -04:00
Josh Brower	0187c9d6df	Adds so-pcap-export	2021-05-26 09:51:37 -04:00
William Wernert	6da37966d9	Update wording for iso location prompt in soup	2021-05-26 09:32:25 -04:00
William Wernert	94af55a951	Fix typo	2021-05-25 11:25:37 -04:00
William Wernert	192cec1825	Change how version with dashes are handled by so-docker-prune	2021-05-25 11:25:12 -04:00
William Wernert	7e008378ba	Replace string with variable, remove unnecessary text	2021-05-25 09:23:44 -04:00
William Wernert	dbc4ffd69a	Fix typo	2021-05-25 09:20:45 -04:00
William Wernert	3bc0def02a	Add failure message to salt-master check	2021-05-24 16:45:05 -04:00
William Wernert	ffd5bfc480	Force images from automated branches to a very high semver	2021-05-24 15:25:03 -04:00
William Wernert	686c7c5a6c	Add exception handling for docker API error to so-docker-prune	2021-05-24 13:26:43 -04:00
William Wernert	99d41d1606	Add ending newline to soup	2021-05-24 11:29:40 -04:00
William Wernert	946e369a44	Merge branch 'dev' into foxtrot	2021-05-21 15:26:24 -04:00
William Wernert	fe3aec173f	Merge branch 'master' into feature/merge-2.3.51 ... # Conflicts: # VERSION # salt/influxdb/init.sls	2021-05-21 12:31:54 -04:00
Jason Ertel	b440f73336	Truncate wait_for_web_response.log before each wait invocation	2021-05-19 18:37:08 -04:00
William Wernert	f445186f1e	Remove redundant error messages	2021-05-18 13:38:55 -04:00
William Wernert	bdd53ed5e3	Change retry delay + count	2021-05-18 12:23:40 -04:00
William Wernert	dbd5ef70c9	Change retry delay + count	2021-05-17 16:19:31 -04:00
William Wernert	ce9554281e	Fix backwards logic	2021-05-17 16:08:34 -04:00
William Wernert	4e1fba5b38	Only echo error code if not using retry	2021-05-17 16:04:13 -04:00
William Wernert	3f238f7a4a	Set flag so trap doesn't repeat info	2021-05-17 16:02:52 -04:00
William Wernert	b89091cc7d	Try retrying in curl instead of shell function	2021-05-17 15:58:25 -04:00
William Wernert	992b76a0f0	Remove debug lines	2021-05-17 15:38:10 -04:00
William Wernert	2bcd51b21c	Fix error message	2021-05-17 15:10:57 -04:00
William Wernert	3625453668	Don't unmount airgap directory if not airgap	2021-05-17 11:00:28 -04:00
William Wernert	192b5db25a	Add true to end of functions ending with shorthand comparison ... Functions ending with test using [[ <false> ]] && <cmd> will trip set -e, so adding true to the last line of the function will prevent the function from returning a nonzero code	2021-05-12 15:26:39 -04:00
William Wernert	9ced391c11	Fix indent in main(), re-add trap, remove ERR_HANDLED variable	2021-05-12 13:20:59 -04:00
William Wernert	807b525c79	Temp remove exit on failure + bash trap	2021-05-12 11:19:33 -04:00
William Wernert	7bd04deae7	Unset exit on failure for pkill command	2021-05-12 10:45:03 -04:00
William Wernert	c379822bf0	Set variable to skip trap if error already handled	2021-05-11 12:59:49 -04:00
William Wernert	f793450d97	Return actual exit code from retry	2021-05-10 13:22:13 -04:00
William Wernert	fec868432f	Try to fix bash trap	2021-05-10 11:59:22 -04:00
William Wernert	d3b08beb53	Only cat file if it exists	2021-05-10 11:11:54 -04:00
William Wernert	a75d4841d0	Add debug lines	2021-05-10 11:05:24 -04:00
William Wernert	8b3730748b	Add debug line and remove exit command on retry failure	2021-05-10 10:58:29 -04:00
William Wernert	de5552c91a	Merge branch 'dev' into issue/3220	2021-05-10 10:33:52 -04:00
William Wernert	f8dd6890b2	Unset/set exit on command fail for retries	2021-05-07 16:50:59 -04:00
m0duspwnens	9eb63b17f9	exit if retry fails	2021-05-07 14:48:02 -04:00
m0duspwnens	009f7617c1	check salt-master is responding	2021-05-07 12:47:22 -04:00
William Wernert	7b29c6427b	Add preliminary error handling in soup	2021-05-07 10:55:17 -04:00
m0duspwnens	d0e084b8ea	change command to test if salt-master is accepting connections	2021-05-07 10:20:04 -04:00
m0duspwnens	46223e0b30	add quotes around minionid	2021-05-07 08:59:47 -04:00
m0duspwnens	5d3b147b42	change retry command	2021-05-06 20:32:26 -04:00
m0duspwnens	b8ad80ae35	update comment	2021-05-06 17:49:40 -04:00