Commit Graph

757 Commits

Author SHA1 Message Date
William Wernert 0edf419bcb Remove redundant message 2021-03-18 13:16:45 -04:00
William Wernert 360f0d4dfd Also print stdout message to log 2021-03-18 13:12:16 -04:00
William Wernert 066a8598a6 Merge pull request #3523 from Security-Onion-Solutions/issue/3493
fix docker versions in setup
2021-03-18 09:31:35 -04:00
William Wernert b5770964c4 Merge pull request #3522 from Security-Onion-Solutions/fix/install-network-manager
[fix] CentOS ami does not include NetworkManager, so install it
2021-03-18 09:10:41 -04:00
William Wernert 31725ac627 [fix] Indent 2021-03-18 09:09:29 -04:00
m0duspwnens dbe54708ef fix docker versions in setup https://github.com/Security-Onion-Solutions/securityonion/issues/3493 2021-03-18 09:09:28 -04:00
William Wernert 163cb8f3ca [fix] Typo 2021-03-18 09:08:31 -04:00
William Wernert 4f104c860e [fix] CentOS ami does not include NetworkManager, so install it 2021-03-18 09:00:02 -04:00
William Wernert 6e3d951b01 [fix] Show message in terminal when restarting Docker to avoid confusion 2021-03-17 20:17:23 -04:00
William Wernert c0163108ab Merge branch 'dev' into foxtrot
# Conflicts:
#	salt/common/tools/sbin/soup
2021-03-17 10:23:51 -04:00
Mike Reeves 137e1a699d Fix the math 2021-03-16 19:01:10 -04:00
Mike Reeves 7719a26a96 Change ES Heap calculation 2021-03-16 18:53:41 -04:00
Wes Lambert 7a02150389 Reverse Zeek index close/delete count for Curator 2021-03-16 17:16:55 +00:00
William Wernert 6a48d7f478 Print curl error to populate variable 2021-03-16 11:34:36 -04:00
William Wernert 59c62393b5 Change back to validating proxy, show user error message from curl 2021-03-16 10:18:02 -04:00
William Wernert 086f2b3437 Change when prereq packages are installed to follow new order 2021-03-15 14:59:24 -04:00
William Wernert 6ae3a26cbe Revert all proxy changes on reinstall 2021-03-15 12:34:13 -04:00
William Wernert f80dfda60b Only run initial installer progress to 98 to avoid sitting at 100 2021-03-12 11:39:44 -05:00
William Wernert 6842204981 Ask for hostname earlier in setup 2021-03-11 16:55:06 -05:00
William Wernert b14b9e8e17 [fix] Fix dependency install progress bar 2021-03-11 16:34:54 -05:00
William Wernert b35e65190e [fix] Fix dependency install progress bar 2021-03-11 16:30:14 -05:00
William Wernert 3306ffa792 Only collect proxy once, include manager in no_proxy value on minions 2021-03-11 16:03:43 -05:00
William Wernert 5612fc10d4 [feat] Remove setup dependency on bc 2021-03-11 15:53:04 -05:00
William Wernert e60bc87ffa Install setup required packages later so that also uses the proxy 2021-03-11 15:20:39 -05:00
William Wernert 0d01f63e3b [fix] Confirm proxy password 2021-03-11 11:46:46 -05:00
William Wernert 5c7d3656dd [fix] Don't try to create so_proxy during automated installs, just set it 2021-03-08 12:26:17 -05:00
William Wernert 368b04b24e Add back accidentally removed code 2021-03-08 09:04:17 -05:00
William Wernert ca2766511b Revert "[wip] Change when proxy is set up so main ip is known"
This reverts commit 1ea3cb1c61.

# Conflicts:
#	setup/so-functions
2021-03-08 09:02:53 -05:00
William Wernert 35ae9363f5 [fix] Log gateway error, and don't show whiptail msg on automated installs 2021-03-05 20:15:37 -05:00
William Wernert 9c49cef2de Merge branch 'feature/docker-prune-rework' into foxtrot 2021-03-05 14:18:57 -05:00
William Wernert f537b3c7f7 Merge branch 'feature/setup-ssh-harden' into foxtrot 2021-03-05 14:18:35 -05:00
William Wernert 32e7afdc5f Merge branch 'feature/setup' into foxtrot 2021-03-05 12:53:31 -05:00
William Wernert 245902326f [wip] Add automation support for proxy settings 2021-03-05 12:53:20 -05:00
William Wernert ec04145d15 [fix] Set proxy for idstools container manually 2021-03-05 11:34:31 -05:00
Jason Ertel 61a7efeeab fix: syntax error in reserved ports configuration; ensure ports are reserved prior to setup 2021-03-05 10:54:01 -05:00
William Wernert 33b2bd33fe [fix] Also create config.json so containers use proxy 2021-03-04 17:12:10 -05:00
William Wernert e0d0baafcc [fix] Permanently set proxy for yum using template 2021-03-04 16:40:32 -05:00
William Wernert b3c7760ad4 [fix] Use correct variable in so-proxy.sh 2021-03-04 14:08:21 -05:00
William Wernert a435ea77e8 [fix] Also add hostname to no_proxy list 2021-03-04 12:43:42 -05:00
William Wernert 2ee8c7ad1c [fix] Always pass $proxy_addr since we retry the surrounding function 2021-03-04 12:16:23 -05:00
William Wernert b265854644 [wip] Move proxy config to separate file 2021-03-04 12:10:42 -05:00
William Wernert 4339ded17f [wip][fix] Don't add logic to so-setup, create wrapper function in so-functions 2021-03-04 12:10:14 -05:00
William Wernert d19ca943cc [fix][wip] Only setup proxy early on configure network setup 2021-03-04 11:57:16 -05:00
William Wernert 2e56252f54 [wip] Syntax fixes 2021-03-04 11:54:21 -05:00
William Wernert 13dc822197 [wip] Ask user if they want to re-enter the proxy 2021-03-04 11:53:08 -05:00
William Wernert 5a97341d33 [wip] Fix how collect_proxy function works on retry 2021-03-04 11:41:36 -05:00
William Wernert 3d5cf128ae [wip] Test proxy before using it 2021-03-03 15:02:21 -05:00
William Wernert 1ea3cb1c61 [wip] Change when proxy is set up so main ip is known
* Also only restart docker if the command exists (i.e. docker is installed)
2021-03-03 14:20:26 -05:00
William Wernert e951e9d9c5 [wip] Further proxy changes
* Remove unused docker.conf template
* Rename proxy variable to avoid name collision
* Reword address prompt to specify users should not include user:pass in their input
* Actually call the collect_proxy function
2021-03-03 12:19:14 -05:00
William Wernert 82018a206c [wip] Don't validate user+pass for proxy, use new variable 2021-03-03 09:56:14 -05:00