CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,167 Commits 24 Branches 119 Tags
6c8a2e68d939f9b93ec769d0057919a8f8141e26
Commit Graph

823 Commits

Author SHA1 Message Date
m0duspwnens
6c8a2e68d9 Merge remote-tracking branch 'remotes/origin/dev' into issue/3264 2021-04-21 18:24:07 -04:00
William Wernert
075ba0d83b Fix salt-master check 2021-04-21 12:01:21 -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
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
m0duspwnens
914a01e321 Merge remote-tracking branch 'remotes/origin/dev' into salt3003.1 2021-04-06 12:02:22 -04:00
m0duspwnens
1ea0be0097 remove references to 3003.1 change to 3003 2021-04-06 09:15:22 -04:00
Jason Ertel
919eec497d Merge branch 'dev' into waagent 2021-04-05 20:19:30 -04:00
Josh Patterson
8dc915e965 Merge pull request #3770 from Security-Onion-Solutions/newrepo 
Fix Spelling issue
 2021-04-05 18:53:19 -04:00
Mike Reeves
168d0bcaf4 Fix Spelling issue 2021-04-05 18:30:07 -04:00
Mike Reeves
08a857239c Merge pull request #3769 from Security-Onion-Solutions/newrepo 
Add some manager logic
 2021-04-05 17:50:05 -04:00
Mike Reeves
a38015bd98 Add some manager logic 2021-04-05 17:28:04 -04:00
Jason Ertel
5f6770925d speculative commit 2021-04-05 16:52:12 -04:00
Mike Reeves
d62ab60d48 Merge pull request #3768 from Security-Onion-Solutions/newrepo 
Newrepo
 2021-04-05 15:03:44 -04:00
Mike Reeves
fc88634159 Set the Repo for airgap during install 2021-04-05 15:01:21 -04:00
m0duspwnens
ae83fa61f3 Merge remote-tracking branch 'remotes/origin/dev' into salt3003.1 2021-04-05 14:36:21 -04:00
Josh Patterson
3adc2a8e63 Merge pull request #3766 from Security-Onion-Solutions/newrepo 
Newrepo
 2021-04-05 14:35:46 -04:00
m0duspwnens
1c3a7094bd upgrade salt to 3003.1 2021-04-05 11:05:48 -04:00
Mike Reeves
d43cb3e133 Merge remote-tracking branch 'remotes/origin/dev' into newrepo 2021-04-05 10:48:01 -04:00
William Wernert
fa373e9db0 Merge branch 'fix/ssh-harden-setup' into foxtrot 2021-04-01 11:04:10 -04:00
William Wernert
761a12ebbb Fix variable name 2021-03-31 13:32:49 -04:00
Mike Reeves
f8d7241354 Fix repo file path 2021-03-31 12:55:46 -04:00
Mike Reeves
89922a439e Move repo files 2021-03-31 12:37:33 -04:00
William Wernert
04920dcbed Merge branch 'dev' into foxtrot 2021-03-31 09:15:17 -04:00
William Wernert
c03e2b2c11 Move ntp server array to its own pillar in the minion sls file 2021-03-31 09:14:40 -04:00
William Wernert
177989269f Better formatting of chrony.conf 2021-03-30 15:50:37 -04:00
William Wernert
fd51b327ee Add messaging to explain chronyc output to log 2021-03-30 15:23:57 -04:00
William Wernert
be6eb3ed6c Restart chrony in case it's already running 2021-03-30 14:17:05 -04:00
Mike Reeves
fc3fd00216 Fix formatting 2021-03-30 11:28:47 -04:00
Mike Reeves
5f5a53b8bb Push repolist to dev null 2021-03-30 11:14:58 -04:00
William Wernert
25eca39428 Always ask for ntp setup on iso installs, don't ask on network installs 2021-03-30 09:54:21 -04:00
William Wernert
2ff790699f [fix] Set ntp_string to empty, not ntp_servers 2021-03-29 09:36:24 -04:00