Commit Graph

900 Commits

Author SHA1 Message Date
Jason Ertel fca1c6e957 Merge branch 'dev' into kilo 2021-06-14 10:40:04 -04:00
Mike Reeves a2e1b1de3a Merge pull request #4484 from Security-Onion-Solutions/pipeline
Pipeline
2021-06-10 13:41:14 -04:00
Jason Ertel 9b61723194 Merge branch 'dev' into kilo 2021-06-08 11:04:09 -04:00
Mike Reeves 4972f69dd6 Merge remote-tracking branch 'remotes/origin/dev' into pipeline 2021-06-08 11:03:14 -04:00
William Wernert 9f2adfb67a Merge branch 'master' into merge_2.3.52
# Conflicts:
#	VERSION
2021-06-07 14:08:17 -04:00
Jason Ertel 84141082ab Avoid applying state when adding web user 2021-06-05 08:41:48 -04:00
William Wernert d1d09d4aab Remove useless variable assignment 2021-06-03 14:20:52 -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 91c8a7c65b Use correct syntax for tar to drop directory structure 2021-06-01 12:16:56 -04:00
Mike Reeves b525cfc787 Remove old modules 2021-05-26 11:07:53 -04:00
Mike Reeves 34d4eedf67 Remove old modules 2021-05-26 10:11:47 -04:00
Jason Ertel 409eea677d Continue removal of argon hashing 2021-05-24 11:50:53 -04:00
Masaya-A 3450219bc7 Drop error to /dev/null 2021-05-20 09:33:14 +09:00
Masaya-A 6af126b872 Fix array 2021-05-19 10:02:19 +09:00
Masaya-A ac42cba50b Adding MAC Address for NIC List 2021-05-19 09:06:02 +09:00
m0duspwnens d9cb018a7d merge with dev, resolve conflicts 2021-04-28 10:19:01 -04:00
Mike Reeves f2628f2e5b Prime the CentOS Repos 2021-04-23 12:09:41 -04:00
m0duspwnens 6c8a2e68d9 Merge remote-tracking branch 'remotes/origin/dev' into issue/3264 2021-04-21 18:24:07 -04:00
William Wernert c297031f6b Surround scalar in single quotes 2021-04-21 17:58:13 -04:00
William Wernert 071e5166b4 Set package manager source in patch pillar for yum.conf 2021-04-21 17:57:02 -04:00
William Wernert 261e7f7fd9 sed and grep need input files 2021-04-21 16:29:24 -04:00
William Wernert c1ae7ff3b6 Set proxy, replace when setting up yum for manager proxy 2021-04-21 16:18:20 -04:00
William Wernert f3d663f090 Don't set yum/apt proxy if updating through manager 2021-04-21 15:59:37 -04:00
William Wernert 075ba0d83b Fix salt-master check 2021-04-21 12:01:21 -04:00
William Wernert 3f007f1026 Disable fastestmirror during setup + soup 2021-04-20 15:18:06 -04:00
William Wernert 95bb757b03 Fix salt-master check 2021-04-20 13:12:55 -04:00
m0duspwnens 115764ae38 merge with dev and fix merge conflict in so-functions https://github.com/Security-Onion-Solutions/securityonion/issues/3264 2021-04-20 10:03:15 -04:00
William Wernert b449955711 Proxy whiptail fixes
* Don't try to set up proxy/manager proxy during network only flow
* Fix logic to never show new menu on airgap, set MANAGERUPDATES to 1 on airgap minions
2021-04-19 16:26:53 -04:00
William Wernert d8457255cb n -> z 2021-04-19 14:06:10 -04:00
William Wernert e8553162a5 [refactor] Change how whiptail asks for proxy settings 2021-04-19 10:51:39 -04:00
m0duspwnens 78ff84f968 Merge remote-tracking branch 'remotes/origin/dev' into salt3003.1 2021-04-13 12:05:58 -04:00
m0duspwnens eb94c011e2 update location of yum keys and repo files for setup 2021-04-13 11:15:15 -04:00
William Wernert 8cb4a75eb1 Merge branch 'dev' into feature/setup-check-manager 2021-04-12 13:14:51 -04:00
William Wernert 73a1bdd885 Send stdout to log, and actually populate error message 2021-04-12 12:59:45 -04:00
William Wernert b2fcd438c2 Initial support for checking state of manager during setup 2021-04-09 09:39:33 -04:00
m0duspwnens ecda46c04b Merge remote-tracking branch 'remotes/origin/dev' into salt3003.1 2021-04-09 09:37:35 -04:00
Mike Reeves c9feda1168 Do not upgrade salt on ISO installs 2021-04-09 08:48:29 -04:00
William Wernert 0ea57b4848 Merge pull request #3805 from Security-Onion-Solutions/foxtrot
Setup option summary + proxy test fix
2021-04-08 12:00:23 -04:00
Mike Reeves 09b14e6a86 Fix Repo Logic 2021-04-08 10:38:50 -04:00
Mike Reeves 4c5f373ffa Fix Repo Logic 2021-04-08 10:37:44 -04:00
Mike Reeves fdaf251ba0 Fix Repo Logic 2021-04-08 10:36:52 -04:00
Mike Reeves 951369c2d6 Fix Repo Logic 2021-04-08 10:25:36 -04:00
Mike Reeves ce9f781d81 Fix Repo Logic 2021-04-08 10:24:04 -04:00
Mike Reeves 725320ebc8 Fix Repo Logic 2021-04-08 10:02:11 -04:00
William Wernert 5e5df4d65a Merge branch 'feature/setup-end-screen' into foxtrot 2021-04-07 13:23:45 -04:00
Mike Reeves c8c1553247 Fix Logic for Airgap distributed 2021-04-07 12:36:50 -04:00
Mike Reeves ed0cd97de5 Fix Logic for Airgap distributed 2021-04-07 12:34:23 -04:00
William Wernert 5b3014496b Proxy fixes
* Adjust proxy test timeout
* Don't show proxy on error
* Add echo statement so user knows what setup is doing
2021-04-07 10:35:59 -04:00
William Wernert 88c565feae Fix proxy test logic 2021-04-07 10:14:16 -04:00
Mike Reeves 5cd7d65b3f Fix Logic for Airgap distributed 2021-04-07 10:03:33 -04:00