Commit Graph

457 Commits

Author SHA1 Message Date
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
William Wernert
dde66a664c Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-05-27 10:11:57 -04:00
William Wernert
c614e0a880 [feat] Add prompt about master needing internet access
When package updates go through the master node, that master needs internet access.
Therefore, prompt the user about this requirement.

Resolves #146
2020-05-27 10:11:54 -04:00
m0duspwnens
446e0f6f4c Merge remote-tracking branch 'remotes/origin/dev' into issue/749 2020-05-27 10:09:36 -04:00
Jason Ertel
65431e0fcc Do not expect network access to be available prior to the NIC being configured for DHCP/Static 2020-05-26 22:39:18 -04:00
Jason Ertel
5d0a7f99e9 Improve logging of automated setup 2020-05-26 18:45:33 -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
Mike Reeves
4049df8cb4 Merge pull request #774 from Security-Onion-Solutions/feature/packages
Feature/packages
2020-05-26 15:40:30 -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
Mike Reeves
d260224dfe Update reboot language 2020-05-26 13:39:36 -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
Jason Ertel
c28936d9e4 temporarily abort automated installation 2020-05-26 09:40:43 -04:00
Jason Ertel
ad97092589 When automating setup installation wait for network availability 2020-05-24 21:38:44 -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
29726e957f [fix] Redirect parse_options output to setup log 2020-05-22 15:16:57 -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
William Wernert
967148890c [fix] Only prompt user about network install on network install 2020-05-22 11:39:32 -04:00
m0duspwnens
b24654002b rename salt custom directory to local 2020-05-21 14:53:25 -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
4e9ccdb6ed Merge pull request #743 from Security-Onion-Solutions/quickfix/wazuh
Quickfix/wazuh
2020-05-20 11:55:26 -04:00
m0duspwnens
4917d88db0 remove wazuh-agent being installed during setup, let salt mage it 2020-05-20 11:45:54 -04:00
m0duspwnens
e07f6af156 remove wazuh-agent exlude being added to repo conf during setup 2020-05-20 11:41:33 -04:00
m0duspwnens
d4840d203c fix version lock for wazuh 2020-05-20 11:23:55 -04:00
Mike Reeves
51250ef751 Update wazuh.repo 2020-05-20 09:56:27 -04:00
William Wernert
320e9d7432 [fix] Apply nginx state before states that rely on it 2020-05-19 14:20:58 -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
3959e1cd10 [fix] Update packages before anything else 2020-05-19 13:03:07 -04:00
William Wernert
6d5af5b07a [fix] Revert redirect fix for saltify and docker_seed_registry 2020-05-19 12:41:19 -04:00
William Wernert
7f08324862 [fix] Redirect stdout + stderr for every command in so-setup 2020-05-19 11:53:50 -04:00
William Wernert
3b3072b002 [fix] Update filtered nic list before trying to flush unused nics 2020-05-19 11:23:59 -04:00