Commit Graph

306 Commits

Author SHA1 Message Date
Jason Ertel
fca1c6e957 Merge branch 'dev' into kilo 2021-06-14 10:40:04 -04:00
Josh Patterson
c2339c84e7 Merge branch 'dev' into hotfix/soup_salt 2021-06-10 15:48:00 -04:00
m0duspwnens
e64059bd7b remove unneeded function 2021-06-10 09:31:10 -04:00
m0duspwnens
46b1de97f5 change function name 2021-06-10 09:30:03 -04:00
m0duspwnens
a82b174826 perform the repo changes for any upgrade 2021-06-09 11:53:10 -04:00
Jason Ertel
9b61723194 Merge branch 'dev' into kilo 2021-06-08 11:04:09 -04:00
William Wernert
9f2adfb67a Merge branch 'master' into merge_2.3.52
# Conflicts:
#	VERSION
2021-06-07 14:08:17 -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
Jason Ertel
3a134cc706 fix merge conflicts 2021-06-02 09:16:28 -04:00
William Wernert
91c8a7c65b Use correct syntax for tar to drop directory structure 2021-06-01 12:16:56 -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
7e008378ba Replace string with variable, remove unnecessary text 2021-05-25 09:23:44 -04:00
William Wernert
3bc0def02a Add failure message to salt-master check 2021-05-24 16:45:05 -04:00
William Wernert
99d41d1606 Add ending newline to soup 2021-05-24 11:29:40 -04:00
m0duspwnens
e2d5102a0e changes for script to auth to elastic 2021-05-24 10:13:29 -04:00
William Wernert
3f238f7a4a Set flag so trap doesn't repeat info 2021-05-17 16:02:52 -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
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
m0duspwnens
78240b4b52 change retry command 2021-05-06 17:49:02 -04:00
m0duspwnens
e7c716ede4 merge with dev, use retry to check if manager up instead of sleep in soup 2021-05-06 16:44:34 -04:00
m0duspwnens
fcd1bea4a3 remove auto data migration, change duration from 0s to 0d 2021-05-04 12:06:03 -04:00
m0duspwnens
3dcaa1f6fb more logging for influxdb migration 2021-05-04 10:37:25 -04:00
m0duspwnens
2d91e509fa update wording 2021-05-04 10:34:13 -04:00
m0duspwnens
a0f1839162 run in background 2021-05-04 09:59:16 -04:00
m0duspwnens
e2f52765e4 add newline 2021-05-04 09:34:42 -04:00
m0duspwnens
f186a3dde9 make sure user sees influxdb migration message by requiring enter to be pressed to continue 2021-05-04 09:30:38 -04:00
Mike Reeves
10c4a7fd98 Update soup 2021-05-04 09:18:59 -04:00
m0duspwnens
9b065155f4 log iunfluxdb migration to new log 2021-05-04 08:56:13 -04:00